diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..899467b
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "libs/SetupWizardLibrary"]
+	path = libs/SetupWizardLibrary
+	url = https://cgit.typeblog.net/SetupWizardLibrary.git
+	branch = android11-dev
diff --git a/app/build.gradle b/app/build.gradle
index a5632f4..0b9c96c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -43,6 +43,8 @@ dependencies {
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
     implementation 'mobi.upod:time-duration-picker:1.1.3'
+    debugImplementation project(path: ':setup-wizard-lib', configuration: 'gingerbreadCompatDebugRuntimeElements')
+    releaseImplementation project(path: ':setup-wizard-lib', configuration: 'gingerbreadCompatReleaseRuntimeElements')
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.4.0-alpha04'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0-alpha04'
diff --git a/libs/SetupWizardLibrary b/libs/SetupWizardLibrary
new file mode 160000
index 0000000..389cc92
--- /dev/null
+++ b/libs/SetupWizardLibrary
@@ -0,0 +1 @@
+Subproject commit 389cc9256395bbe3da587cd2ec7ffc5bf8439487
diff --git a/settings.gradle b/settings.gradle
index e7b4def..6c42099 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,5 @@
 include ':app'
+
+include ':setup-wizard-lib'
+project(':setup-wizard-lib').projectDir = new File('./libs/SetupWizardLibrary/library')
+project(':setup-wizard-lib').buildFileName = 'standalone.gradle'
\ No newline at end of file