diff --git a/includes/Hooks.php b/includes/Hooks.php
index cf4d890..de2cf16 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -12,13 +12,13 @@ class Hooks implements GetPreferencesHook {
 	/**
 	 * @param ResourceLoaderContext $context
 	 * @param Config $config
-	 * @return $wgLakeusWvuiSearchOptions
+	 * @return $wgLakeusSearchOptions
 	 */
-	public function getLakeusWvuiSearchResourceLoaderConfig(
+	public function getLakeusSearchResourceLoaderConfig(
 		ResourceLoaderContext $context,
 		Config $config
 	) {
-		return $config->get( 'LakeusWvuiSearchOptions' );
+		return $config->get( 'LakeusSearchOptions' );
 	}
 
 	/**
diff --git a/skin.json b/skin.json
index 11b5943..7df6ab8 100644
--- a/skin.json
+++ b/skin.json
@@ -197,18 +197,18 @@
 			]
 		},
 		"skins.lakeus.search": {
+			"es6": true,
 			"dependencies": [
-				"mediawiki.Uri",
-				"wvui"
+				"mediawiki.Uri"
 			],
-			"es6": true,
 			"packageFiles": [
 				"resources/skins.lakeus.search/skins.lakeus.search.js",
 				"resources/skins.lakeus.search/App.vue",
 				{
 					"name": "resources/skins.lakeus.search/config.json",
-					"callback": "MediaWiki\\Skins\\Lakeus\\Hooks::getLakeusWvuiSearchResourceLoaderConfig"
+					"callback": "MediaWiki\\Skins\\Lakeus\\Hooks::getLakeusSearchResourceLoaderConfig"
 				}
+
 			],
 			"messages": [
 				"searchbutton",
@@ -293,10 +293,11 @@
 			"value": "",
 			"description": "Override default search API. Can be used with $wgDisableTextSearch and $wgSearchForwardUrl to mimic user experience on production."
 		},
-		"LakeusUseWvuiSearch": {
-			"value": true
+		"LakeusSearchModuleType": {
+			"value": null,
+			"description": "Which search module to use. Options: null (default Codex / WVUI based on MediaWiki version) / 'codex' (Codex) / 'wvui' (WVUI) / 'jquery' (legacy jQuery search)."
 		},
-		"LakeusWvuiSearchOptions": {
+		"LakeusSearchOptions": {
 			"value": {
 				"showThumbnail": true,
 				"showDescription": true