diff --git a/WebKitBrowser/CMakeLists.txt b/WebKitBrowser/CMakeLists.txt
index e474836a60..4753fa9b79 100644
--- a/WebKitBrowser/CMakeLists.txt
+++ b/WebKitBrowser/CMakeLists.txt
@@ -22,7 +22,6 @@ cmake_minimum_required(VERSION 3.3)
 find_package(WPEFramework)
 project_version(1.0.0)
 
-#set(PLUGIN_NAME WebKitBrowser)
 set(MODULE_NAME ${NAMESPACE}${PROJECT_NAME})
 
 message("Setup ${MODULE_NAME} v${PROJECT_VERSION}")
@@ -345,61 +344,51 @@ else()
     set(PLUGIN_YOUTUBE_WIDTH ${PLUGIN_WEBKITBROWSER_WIDTH})
 endif()
 
-write_config()
-#write_config( ${PLUGIN_NAME} )
+write_config(${PROJECT_NAME})
 
 # youtube configuration
 if(PLUGIN_WEBKITBROWSER_YOUTUBE)
-    write_config( PLUGINS YouTube )
-#    write_config( YouTube )
+    write_config(YouTube)
 endif()
 
 # amazon configuration
 if(PLUGIN_AMAZON_HYBRID)
-    write_config( PLUGINS Amazon )
-#   write_config( Amazon )
+    write_config(Amazon)
 endif()
 
 # Applications instance configuration
 if(PLUGIN_WEBKITBROWSER_APPS)
-    write_config( PLUGINS Apps )
-#    write_config( Apps )
+    write_config(Apps)
 endif()
 
 # UX configuration
 if(PLUGIN_WEBKITBROWSER_UX)
-    write_config( PLUGINS UX )
-#    write_config( UX )
+    write_config(UX)
 endif()
 
 # Search&Discovery configuration
 if(PLUGIN_WEBKITBROWSER_SEARCH_AND_DISCOVERY_APP)
-    write_config( PLUGINS SearchAndDiscoveryApp )
-#    write_config( SearchAndDiscoveryApp )
+    write_config(SearchAndDiscoveryApp)
 endif()
 
 # Html App configuration
 if(PLUGIN_WEBKITBROWSER_HTML_APP)
-    write_config( PLUGINS HtmlApp )
-#    write_config( HtmlApp )
+    write_config(HtmlApp)
 endif()
 
 # Lightning App configuration
 if(PLUGIN_WEBKITBROWSER_LIGHTNING_APP)
-    write_config( PLUGINS LightningApp )
-#    write_config( LightningApp )
+    write_config(LightningApp)
 endif()
 
 # JSPP configuration
 if(PLUGIN_WEBKITBROWSER_JSPP)
-    write_config( PLUGINS JSPP )
-#    write_config( JSPP )
+    write_config(JSPP)
 endif()
 
 # Resident App configuration
 if(PLUGIN_WEBKITBROWSER_RESIDENT_APP)
-    write_config( PLUGINS ResidentApp )
-#    write_config( ResidentApp )
+    write_config(ResidentApp)
 endif()
 
 if(PLUGINS_CREATE_IPKG_TARGETS)