diff --git a/.gitmodules b/.gitmodules
index c8ecba3..ba0decb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,8 @@
[submodule "dependencies/Connected"]
path = dependencies/Connected
url = https://git.tompit.com/Connected/Connected.git
+ branch = develop
[submodule "dependencies/Connected.Components"]
path = dependencies/Connected.Components
url = https://git.tompit.com/Connected/Connected.Components.git
+ branch = features/rewrite/main
diff --git a/build/init.bat b/build/init.bat
new file mode 100644
index 0000000..017ad52
--- /dev/null
+++ b/build/init.bat
@@ -0,0 +1,22 @@
+@echo off
+
+SET root=%cd%
+
+echo "Syncing submodules"
+git submodule sync
+git submodule update --init --remote
+echo "Submodules up to date"
+
+FOR /F "delims=" %%a IN ('DIR "../dependencies" /A:d /B') DO (
+ echo Handling %%a
+ cd ../dependencies/%%a/build
+ echo %cd%
+ IF EXIST init.bat (
+ echo "found init.bat"
+ call init
+ )
+ cd %root%
+)
+
+cd ../
+dotnet build
\ No newline at end of file
diff --git a/dependencies/Connected b/dependencies/Connected
index cc259df..dd40532 160000
--- a/dependencies/Connected
+++ b/dependencies/Connected
@@ -1 +1 @@
-Subproject commit cc259dfc18c4ad6989898fa813e281b9249c3bd3
+Subproject commit dd40532a0ff03237407de9635c7211c5e1af5807
diff --git a/dependencies/Connected.Components b/dependencies/Connected.Components
index a63bd4e..a9e0968 160000
--- a/dependencies/Connected.Components
+++ b/dependencies/Connected.Components
@@ -1 +1 @@
-Subproject commit a63bd4e5edec2e40f70fceebc700be4e3ac13def
+Subproject commit a9e0968740c970e01fbef1d434f5802511ac138f
diff --git a/src/Connected.UI/Connected.UI.csproj b/src/Connected.UI/Connected.UI.csproj
index 7b2bd9a..338eaf9 100644
--- a/src/Connected.UI/Connected.UI.csproj
+++ b/src/Connected.UI/Connected.UI.csproj
@@ -12,7 +12,7 @@
-
+