diff --git a/.gitmodules b/.gitmodules
index e42eb5d..1ea57df 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,15 +1,15 @@
 [submodule "system"]
 	path = system
-	url = https://github.com/kohana/core.git
+    url = https://github.com/Daniel15/kohana-core.git
 [submodule "modules/auth"]
 	path = modules/auth
 	url = https://github.com/kohana/auth.git
 [submodule "modules/database"]
 	path = modules/database
-	url = https://github.com/kohana/database.git
+	url = https://github.com/Daniel15/kohana-database.git
 [submodule "modules/orm"]
 	path = modules/orm
 	url = https://github.com/kohana/orm.git
 [submodule "modules/pagination"]
 	path = modules/pagination
-	url = https://github.com/Daniel15/kohana-pagination.git
+	url = https://github.com/Daniel15/kohana-pagination.git
\ No newline at end of file
diff --git a/application/config/database.php b/application/config/database.php
index b2d0e99..1bbde16 100644
--- a/application/config/database.php
+++ b/application/config/database.php
@@ -4,7 +4,7 @@ return array
 (
 	'default' => array
 	(
-		'type'       => 'mysql',
+		'type'       => 'mysqli',
 		'connection' => array(
 			/**
 			 * The following options are available for MySQL:
diff --git a/modules/database b/modules/database
index d369a3b..59ccb2a 160000
--- a/modules/database
+++ b/modules/database
@@ -1 +1 @@
-Subproject commit d369a3bfcebcc9cb5b279cd07707fc91485530e1
+Subproject commit 59ccb2a47297e356fa339eee3a7654fd0aa152f5
diff --git a/modules/pagination b/modules/pagination
index eceed49..efeed1f 160000
--- a/modules/pagination
+++ b/modules/pagination
@@ -1 +1 @@
-Subproject commit eceed49f290ebb632d11dfb4f1f1adc0f6f2eeff
+Subproject commit efeed1f9de04ad6165a20ff5d2f305dc037bff88
diff --git a/system b/system
index fb23e91..17ab347 160000
--- a/system
+++ b/system
@@ -1 +1 @@
-Subproject commit fb23e916ed8334dda53f4efbbbefea66f6d4a070
+Subproject commit 17ab3477774cea081ace9a98e64af804111a0322