diff --git a/uaswitch/init.lua b/uaswitch/init.lua
index bab70b6..4a076ce 100644
--- a/uaswitch/init.lua
+++ b/uaswitch/init.lua
@@ -3,7 +3,6 @@
 -- © 2012 Plaque FCC <Reslayer@ya.ru>                     --
 ------------------------------------------------------------
 
-local globals   = globals
 local string    = string
 local type      = type
 local dofile    = dofile
@@ -12,55 +11,50 @@ local error     = error
 local pairs     = pairs
 local ipairs    = ipairs
 local io        = io
-local capi      = { luakit = luakit }
-local lousy     = require ("lousy")
-local util      = lousy.util
-local add_binds, add_cmds = add_binds, add_cmds
-local lfs       = require ("lfs")
+local settings  = require("settings")
 local plugins   = require ("plugins")
-local window    = window
+local window    = require ("window")
+local modes	= require ("modes")
 
-module("plugins.uaswitch")
 
-ua_alias_default = "default"
 
-ua_strings_file = plugins.plugins_dir .. "uaswitch/ua_strings.lua"
-
-ua_strings = {}
+local ua_strings_file = plugins.plugins_dir .. "uaswitch/ua_strings.lua"
+local _M = {}
+_M.ua_strings = {}
+_M.hide_box = false
 
 -- Refresh open filters views (if any)
 function update_views()
     for _, w in pairs(window.bywidget) do
         for _, v in ipairs(w.tabs.children) do
-            v.user_agent = globals.useragent
+            v.user_agent = settings.webview.user_agent
         end
     end
 end
 
 function load_ua_strings()
-    ua_strings = {
-        original = string.rep(globals.useragent, 1),
-        fakes = {}
+    _M.ua_strings = {
+        original = string.rep(settings.webview.user_agent, 1),
+	fakes = dofile (ua_strings_file)
     }
-    dofile(ua_strings_file)
 end
 
 function switch_to(alias)
     if (not alias) then
-        alias = ua_alias_default
+        alias = "default"
     end
     assert(type(alias) == "string", "user agent switch: invalid user agent alias")
     local useragent = nil
     io.stdout:write("uaswitcher: Requested change to '" .. alias .."'.\n")
-    if (alias == ua_alias_default) then
-        useragent = ua_strings.original
+    if (alias == "default") then
+        useragent = _M.ua_strings.original
     else
-        useragent = ua_strings.fakes[alias]
+        useragent = _M.ua_strings.fakes[alias]
     end
 
     if (useragent) then
         io.stdout:write("uaswitcher: Change to '" .. useragent .."'.\n")
-        globals.useragent = string.rep(useragent, 1)
+        settings.webview.user_agent = string.rep(useragent, 1)
         update_views()
         return
     else
@@ -68,19 +62,13 @@ function switch_to(alias)
     end
 end
 
-function load()
-    load_ua_strings()
-    -- switch_to(ua_alias_default)
-    switch_to("inferfox") -- And let them choke! ;'D
-end
 
 -- Add commands.
-local cmd = lousy.bind.cmd
-add_cmds({
-    cmd({"user-agent", "ua"}, function (w, a)
-        switch_to(a)
-    end),
+modes.add_cmds({
+	{ ":user-agent", "Set user-agent string", function (w, a)
+	    switch_to(a.arg)
+	end},
 })
 
--- Initialise module
-load()
+load_ua_strings()
+return _M
diff --git a/uaswitch/ua_strings.lua b/uaswitch/ua_strings.lua
index ce302e4..5f99bbf 100644
--- a/uaswitch/ua_strings.lua
+++ b/uaswitch/ua_strings.lua
@@ -1,5 +1,4 @@
-plugins.uaswitch.ua_strings.fakes = {
-    
+return {
         ["inferfox"]        = "Mozilla/6.0 (compatible; AppleWebKit/latest; like Gecko/20120405; };-> infernal_edition:goto-hell) Firefox/666",
         ["firefox_15"]      = "Mozilla/5.0 (Windows NT 6.1; rv:15.0) Gecko/20120427 Firefox/15.0a1",
         ["firefox_14"]      = "Mozilla/5.0 (Windows NT 6.1; rv:14.0) Gecko/20120405 Firefox/14.0a1",