diff --git a/.gitmodules b/.gitmodules
index ed3ff1d8..1ac4fa50 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "Calclavia-Library"]
 	path = Calclavia-Library
-	url = https://calclavia@bitbucket.org/calclavia/calclavia-library.git
+url=git@bitbucket.org:calclavia/calclavia-core.git
 [submodule "Universal-Electricity"]
 	path = Universal-Electricity
-	url = https://github.com/Universal-Electricity/Universal-Electricity
+	url = https://github.com/Universal-Electricity/Universal-Electricity
\ No newline at end of file
diff --git a/Calclavia-Library b/Calclavia-Library
index a4efa253..12b68996 160000
--- a/Calclavia-Library
+++ b/Calclavia-Library
@@ -1 +1 @@
-Subproject commit a4efa25313f480b235bc461c8fc824012af073f4
+Subproject commit 12b68996e9766402e0d14ee4df059f3ece3c2169
diff --git a/Universal-Electricity b/Universal-Electricity
index e8c85dd8..f5b6b988 160000
--- a/Universal-Electricity
+++ b/Universal-Electricity
@@ -1 +1 @@
-Subproject commit e8c85dd80b54f9364dc619520cd064fb220e0b87
+Subproject commit f5b6b9884d1f9acb78fba187b9ad3a30ca678750