Merging experimental into default

1 files changed, 101 insertions, 111 deletions

diff --git a/src/config.h b/src/config.h
index a771b85e..951a1ddb 100644
--- a/src/config.h
+++ b/src/config.h
@@ -17,14 +17,14 @@
  */
 
 static KeyValue KEYS[] = {
-  { "add_view",                 {   "ga",         0,                  },  },  
+  { "tab_new",                  {   "ga",         0,                  },  },  
   { "allow_cookie",             {   "CC",         0,                   },  },  
   { "allow_session_cookie",     {   "CS",         0,                   },  },  
   { "allow_session_cookie_tmp", {   "CT",         0,                   },  },  
   { "bookmark",                 {   "M",         0,                   },  },  
   { "bookmarks",                {   "gb",        0,                   },  },  
-  { "bookmarks_nv",             {   "gB",        0,                   },  },  
-  { "bookmarks_nw",             {   "wB",        0,                   },  },  
+  { "tab_bookmarks",            {   "gB",        0,                   },  },  
+  { "win_bookmarks",            {   "wB",        0,                   },  },  
   { "command_mode",             {   ":",         0,                   },  },  
   { "only",                     {   "co",         0,                   },  },  
   { "find_forward",             {   "/",         0,                   },  }, 
@@ -33,41 +33,41 @@ static KeyValue KEYS[] = {
   { "find_backward",            {   "?",         0,                   },  },  
   { "focus_next",               {   "J",         0,                   },  },  
   { "focus_prev",               {   "K",         0,                   },  },  
-  { "focus_nth_view",           {   "T",         0,                   },  },  
-  { "hint_mode",                {   "f",         0,                   },  },  
-  { "hint_mode_links",          {   ";;",         0,                   },  },  
-  { "hint_mode_images",         {   ";i",         0,                   },  },  
-  { "hint_mode_images_nv",      {   ";I",         0,                   },  },  
-  { "hint_mode_editable",       {   ";e",         0,                   },  },  
-  { "hint_mode_url",            {   ";o",         0,                   },  },  
-  { "hint_mode_url_nv",         {   ";O",         0,                   },  },  
-  { "hint_mode_download",       {   ";d",           0 }, },
-  { "hint_mode_nv",             {   "F",         0,                   },  },  
-  { "hint_mode_nw",             {   "wf",         0,                   },  },  
-  { "hint_mode_clipboard",      {   ";y",         0,                   },  },  
-  { "hint_mode_primary",        {   ";Y",         0,                   },  },  
-  { "hint_mode_rapid",          {   ";r",         0,                   },  },  
-  { "hint_mode_rapid_nw",       {   ";R",         0,                   },  },  
+  { "focus_tab",           {   "T",         0,                   },  },  
+  { "hints",                {   "f",         0,                   },  },  
+  { "hints_links",          {   ";;",         0,                   },  },  
+  { "hints_images",         {   ";i",         0,                   },  },  
+  { "hints_images_tab",      {   ";I",         0,                   },  },  
+  { "hints_editable",       {   ";e",         0,                   },  },  
+  { "hints_url",            {   ";o",         0,                   },  },  
+  { "hints_url_tab",         {   ";O",         0,                   },  },  
+  { "hints_download",       {   ";d",           0 }, },
+  { "hints_tab",             {   "F",         0,                   },  },  
+  { "hints_win",             {   "wf",         0,                   },  },  
+  { "hints_clipboard",      {   ";y",         0,                   },  },  
+  { "hints_primary",        {   ";Y",         0,                   },  },  
+  { "hints_rapid",          {   ";r",         0,                   },  },  
+  { "hints_rapid_win",       {   ";R",         0,                   },  },  
   { "history_back",             {   "H",         0,                   },  },  
   { "history_forward",          {   "L",         0,                   },  },  
-  { "history_back_nv",             {   "th",         0,                   },  },  
-  { "history_forward_nv",          {   "tl",         0,                   },  },  
-  { "history_back_nw",             {   "wh",         0,                   },  },  
-  { "history_forward_nw",          {   "wl",         0,                   },  },  
+  { "tab_hist_back",             {   "th",         0,                   },  },  
+  { "tab_hist_forward",          {   "tl",         0,                   },  },  
+  { "win_hist_back",             {   "wh",         0,                   },  },  
+  { "win_hist_forward",          {   "wl",         0,                   },  },  
   { "insert_mode",              {   "i",         0,                   },  },  
   { "open",                     {   "o",         0,                   },  },  
-  { "Open",                     {   "go",        0,                   },  }, 
-  { "open_nv",                  {   "O",         0,                   },  },  
-  { "Open_nv",                  {   "gO",         0,                   },  },  
-  { "open_nw",                  {   "wo",         0,                   },  },  
-  { "Open_nw",                  {   "wO",         0,                   },  },  
-  { "open_start_page",          {   "h",         GDK_CONTROL_MASK,    },  },  
-  { "open_quickmark",           {   "b",         0,                   },  },  
-  { "open_quickmark_nv",        {   "B",         0,                   },  },  
-  { "open_quickmark_nw",        {   "wb",        0,                   },  },  
+  { "open_url",                     {   "go",        0,                   },  }, 
+  { "tabopen",                  {   "O",         0,                   },  },  
+  { "tabopen_url",                  {   "gO",         0,                   },  },  
+  { "winopen",                  {   "wo",         0,                   },  },  
+  { "winopen_url",                  {   "wO",         0,                   },  },  
+  { "start_page",          {   "h",         GDK_CONTROL_MASK,    },  },  
+  { "quickmark",           {   "b",         0,                   },  },  
+  { "tab_quickmark",        {   "B",         0,                   },  },  
+  { "win_quickmark",        {   "wb",        0,                   },  },  
   { "reload",                   {   "r",         0,                   },  },  
   { "reload_bypass_cache",      {   "R",         0,                   },  },  
-  { "remove_view",              {   "d",         0,                   },  },  
+  { "close_tab",              {   "d",         0,                   },  },  
   { "save_quickmark",           {   "m",         0,                   },  },  
   { "scroll_bottom",            {   "G",         0,                   },  },  
   { "scroll_down",              {   "j",         0,                   },  },  
@@ -82,7 +82,6 @@ static KeyValue KEYS[] = {
   { "show_keys",                {   "Sk",         0,                  },  },  
   { "show_settings",            {   "Ss",        0,                  },  },  
   { "stop_loading",             {   "s",         GDK_CONTROL_MASK,   },  },  
-  { "toggle_bottomstack",       {   "tb",         0,  },  },  
   { "view_source",              {   "gf",         0,                  },  },  
   { "zoom_in",                  {   "+",         0,                  },  },  
   { "zoom",                     {   "=",         0,                  },  },  
@@ -99,10 +98,10 @@ static KeyValue KEYS[] = {
   { "yank_title_primary",       {   "yT",           0, }, }, 
   { "paste",                    {   "pp",           0, }, }, 
   { "paste_primary",            {   "pP",           0, }, }, 
-  { "paste_nv",                 {   "Pp",           0, }, }, 
-  { "paste_primary_nv",         {   "PP",           0, }, }, 
-  { "paste_nw",                 {   "wp",           0, }, }, 
-  { "paste_primary_nw",         {   "wP",           0, }, }, 
+  { "tab_paste",                 {   "Pp",           0, }, }, 
+  { "tab_paste_primary",         {   "PP",           0, }, }, 
+  { "win_paste",                 {   "wp",           0, }, }, 
+  { "win_paste_primary",         {   "wP",           0, }, }, 
   /* entry  shortcuts */
   { "entry_delete_word",        {   "w",            GDK_CONTROL_MASK, }, }, 
   { "entry_delete_word_forward",{   "e",            GDK_CONTROL_MASK, }, }, 
@@ -133,24 +132,24 @@ static KeyValue KEYS[] = {
   { "toggle_plugins_host",      {   "ph",           0 }, }, 
   { "toggle_plugins_uri_tmp",   {   "ptu",           0 }, }, 
   { "toggle_plugins_host_tmp",  {   "pth",           0 }, }, 
-  { "new_view",                 {   "V",            0 }, }, 
-  { "new_window",               {   "W",            0 }, }, 
+  { "new_tab",                 {   "V",            0 }, }, 
+  { "new_win",               {   "W",            0 }, }, 
   { "save",                     {   "sf",            0 }, }, 
   { "undo",                     {   "u",            0 }, }, 
   { "execute_userscript",       {   "eu",           0 }, },  
   { "print",                    {   "p",            GDK_CONTROL_MASK | GDK_MOD1_MASK }, }, 
   { "load_html",                    {   NULL,         0 }, }, 
-  { "load_html_nv",                    {   NULL,         0 }, }, 
+  { "load_html_tab",                    {   NULL,         0 }, }, 
   { "toggle_hidden_files",          {   "g.",         0 }, }, 
   { "complete_path",          {   "p",         GDK_CONTROL_MASK }, }, 
   { "quit",                   {   "q",         GDK_CONTROL_MASK }, }, 
-  { "fullscreen",             {   "F11",         GDK_CONTROL_MASK }, }, 
+  { "fullscreen",             {   "@F11@",         0 }, }, 
   { "pass_through",           {   "i",        GDK_CONTROL_MASK }, }, 
   { "open_editor",            {   "e",        GDK_CONTROL_MASK }, }, 
   { "toggle_bars",            {   "xx",        0 }, }, 
-  { "toggle_topbar",            {   "xt",        0 }, }, 
-  { "toggle_bottombar",            {   "xb",        0 }, }, 
-  { "presentation_mode",            {   "F12",        GDK_CONTROL_MASK }, }, 
+  { "toggle_tabbar",            {   "xt",        0 }, }, 
+  { "toggle_statusbar",            {   "xb",        0 }, }, 
+  { "presentation_mode",            {   "@F12@",        0 }, }, 
   { "protect",                {   "P",        GDK_CONTROL_MASK }, }, 
   { "lock_uri",                {   "xu",        0 }, }, 
   { "lock_domain",                {   "xd",        0 }, }, 
@@ -163,7 +162,7 @@ static KeyValue KEYS[] = {
 
 /* FUNCTION_MAP{{{*/
 static FunctionMap FMAP [] = {
-  { { "add_view",              "Add a new view",                    }, 1, 
+  { { "tab_new",              "Add a new tab",                    }, 1, 
     (Func)commands_add_view,            NULL,                            ALWAYS_SM,     
     { .p = NULL },                          EP_NONE,    { NULL }, },
 
@@ -183,11 +182,11 @@ static FunctionMap FMAP [] = {
     (Func) commands_toggle_bars,                                     NULL,     ALWAYS_SM,    
     { .n = BAR_VIS_STATUS | BAR_VIS_TOP  }, EP_NONE, { "bars", NULL }, },
 
-  { { "toggle_topbar",    "Toggle visibility of tabbar" },                 1, 
+  { { "toggle_tabbar",    "Toggle visibility of tabbar" },                 1, 
     (Func) commands_toggle_bars,                NULL,     ALWAYS_SM,    
     { .n = BAR_VIS_TOP  },                  EP_NONE,  { "tbar", NULL }, },
 
-  { { "toggle_bottombar",    "Toggle visibility of statusbar" },                 1, 
+  { { "toggle_statusbar",    "Toggle visibility of statusbar" },                 1, 
     (Func) commands_toggle_bars,                                     NULL,     ALWAYS_SM,    
     { .n = BAR_VIS_STATUS }, EP_NONE, { NULL }, },
 
@@ -226,23 +225,23 @@ static FunctionMap FMAP [] = {
     (Func)commands_bookmark,            NO_URL,                            POST_SM,     
     {0},  EP_NONE, { "bmark", "bma", NULL }, },
   
-  { { "bookmarks",             "Bookmarks",                         }, CP_COMMANDLINE|CP_HAS_MODE,
+  { { "bookmarks",             "bookmarks",                         }, CP_COMMANDLINE|CP_HAS_MODE,
     (Func)commands_bookmarks,           "No Bookmarks",                    NEVER_SM,     
     { .n = OPEN_NORMAL }, EP_NONE, { "bmarks", "bmas", NULL }, },
   
-  { { "bookmarks_nv",          "Bookmarks new tab",                }, CP_COMMANDLINE|CP_HAS_MODE,
+  { { "tab_bookmarks",          "tabmarks",                }, CP_COMMANDLINE|CP_HAS_MODE,
     (Func)commands_bookmarks,           "No Bookmarks",                    NEVER_SM,     
     { .n = OPEN_NEW_VIEW }, EP_NONE, { "tabmarks", NULL }, },
   
-  { { "bookmarks_nw",          "Bookmarks new window",              }, CP_COMMANDLINE|CP_HAS_MODE, 
+  { { "win_bookmarks",          "winmarks",              }, CP_COMMANDLINE|CP_HAS_MODE, 
     (Func)commands_bookmarks,           "No Bookmarks",                    NEVER_SM,     
     { .n = OPEN_NEW_WINDOW}, EP_NONE, { "winmarks", NULL }, },
   
-  { { "new_view",              "New view for next navigation",      }, 0, 
+  { { "new_tab",              "new_tab",      }, 0, 
     (Func)commands_new_window_or_view,  NULL,                              NEVER_SM,     
     { .n = OPEN_NEW_VIEW }, EP_NONE, { NULL }, },
   
-  { { "new_window",            "New window for next navigation",    }, 0, 
+  { { "new_win",            "new_win",    }, 0, 
     (Func)commands_new_window_or_view,  NULL,                              NEVER_SM,     
     { .n = OPEN_NEW_WINDOW }, EP_NONE, { NULL }, },
   
@@ -270,71 +269,71 @@ static FunctionMap FMAP [] = {
     (Func)commands_focus_input,        "No input found in current context",      ALWAYS_SM, 
     {0}, EP_NONE, { NULL }, },
   
-  { { "focus_next",            "Focus next view",                   }, CP_COMMANDLINE | CP_HAS_MODE, 
-    (Func)commands_focus,              "No other view",                   ALWAYS_SM,  
+  { { "focus_next",            "Focus next tab",                   }, CP_COMMANDLINE | CP_HAS_MODE, 
+    (Func)commands_focus,              "No other tab",                   ALWAYS_SM,  
     { .n = 1 }, EP_NONE, { "tabnext", NULL }, },
   
-  { { "focus_prev",            "Focus previous view",               }, CP_COMMANDLINE | CP_HAS_MODE, 
-    (Func)commands_focus,              "No other view",                   ALWAYS_SM,  
+  { { "focus_prev",            "Focus previous tab",               }, CP_COMMANDLINE | CP_HAS_MODE, 
+    (Func)commands_focus,              "No other tab",                   ALWAYS_SM,  
     { .n = -1 }, EP_NONE, { "tabprev", NULL }, },
-
-  { { "focus_nth_view",        "Focus nth view",                    }, CP_COMMANDLINE | CP_HAS_MODE, 
-    (Func)commands_focus_nth_view,       "No such view",                   ALWAYS_SM,  
+  
+  { { "focus_tab",        "Focus nth tab",                    }, CP_COMMANDLINE | CP_HAS_MODE, 
+    (Func)commands_focus_nth_view,       "No such tab",                   ALWAYS_SM,  
     { 0 }, EP_NONE, { "tab", NULL }, },
   
-  { { "hint_mode",             "Follow hints",                      }, CP_COMMANDLINE | CP_HAS_MODE, 
+  { { "hints",             "Follow hints",                      }, CP_COMMANDLINE | CP_HAS_MODE, 
     (Func)commands_show_hints,          NO_HINTS,                          NEVER_SM,    
     { .n = OPEN_NORMAL, .i = HINT_T_ALL }, EP_NONE, { "hints", "hi",  NULL }, },
   
-  { { "hint_mode_links",       "Follow links",                      }, CP_COMMANDLINE | CP_HAS_MODE, 
+  { { "hints_links",       "Follow links",                      }, CP_COMMANDLINE | CP_HAS_MODE, 
     (Func)commands_show_hints,          "No links",                          NEVER_SM,    
     { .n = OPEN_NORMAL, .i = HINT_T_LINKS }, EP_NONE, { "lhints", "lhi", NULL }, },
   
-  { { "hint_mode_images",       "Follow images",                      }, CP_COMMANDLINE | CP_HAS_MODE, 
+  { { "hints_images",       "Follow images",                      }, CP_COMMANDLINE | CP_HAS_MODE, 
     (Func)commands_show_hints,          "No images",                          NEVER_SM,    
     { .n = OPEN_NORMAL, .i = HINT_T_IMAGES }, EP_NONE, { "ihints", "ihi", NULL }, },
   
-  { { "hint_mode_images_nv",       "Follow images in new tab",                      }, CP_COMMANDLINE | CP_HAS_MODE, 
+  { { "hints_images_tab",       "Follow images in new tab",                      }, CP_COMMANDLINE | CP_HAS_MODE, 
     (Func)commands_show_hints,          "No images",                          NEVER_SM,    
     { .n = OPEN_NEW_VIEW, .i = HINT_T_IMAGES }, EP_NONE, { "itabhints", "ithi", NULL }, },
   
-  { { "hint_mode_editable",       "Follow editable",                      }, CP_COMMANDLINE | CP_HAS_MODE, 
+  { { "hints_editable",       "Follow editable",                      }, CP_COMMANDLINE | CP_HAS_MODE, 
     (Func)commands_show_hints,          "No editable elements",           NEVER_SM,    
     { .n = OPEN_NORMAL, .i = HINT_T_EDITABLE }, EP_NONE, { "ehints", "ehi", NULL }, },
   
-  { { "hint_mode_url",            "hintopen",                      }, CP_COMMANDLINE | CP_HAS_MODE, 
+  { { "hints_url",            "hintopen",                      }, CP_COMMANDLINE | CP_HAS_MODE, 
     (Func)commands_show_hints,          NO_HINTS,           NEVER_SM,    
     { .n = OPEN_NORMAL, .i = HINT_T_URL }, EP_NONE, { "uhints", "uhi", NULL }, },
   
-  { { "hint_mode_url_nv",         "hinttabopen",                      }, CP_COMMANDLINE | CP_HAS_MODE, 
+  { { "hints_url_tab",         "hinttabopen",                      }, CP_COMMANDLINE | CP_HAS_MODE, 
     (Func)commands_show_hints,          NO_HINTS,           NEVER_SM,    
     { .n = OPEN_NEW_VIEW, .i = HINT_T_URL }, EP_NONE, { "utabhints", "uthi",  NULL }, },
   
-  { { "hint_mode_nv",          "Follow hints in new tab",           }, CP_COMMANDLINE | CP_HAS_MODE, 
+  { { "hints_tab",          "Follow hints in new tab",           }, CP_COMMANDLINE | CP_HAS_MODE, 
     (Func)commands_show_hints,          NO_HINTS,                          NEVER_SM,    
     { .n = OPEN_NEW_VIEW, .i = HINT_T_ALL }, EP_NONE, { "tabhints", "thi", NULL }, },
   
-  { { "hint_mode_nw",          "Follow hints in new window",         }, CP_COMMANDLINE | CP_HAS_MODE, 
+  { { "hints_win",          "Follow hints in new window",         }, CP_COMMANDLINE | CP_HAS_MODE, 
     (Func)commands_show_hints,          NO_HINTS,                          NEVER_SM,    
     { .n = OPEN_NEW_WINDOW, .i = HINT_T_ALL }, EP_NONE, { "winhints", "whi", NULL }, },
   
-  { { "hint_mode_clipboard",          "Copy to clipboard",         }, CP_COMMANDLINE | CP_HAS_MODE, 
+  { { "hints_clipboard",          "Copy to clipboard",         }, CP_COMMANDLINE | CP_HAS_MODE, 
     (Func)commands_show_hints,          NO_HINTS,                          NEVER_SM,    
     { .n = OPEN_NORMAL, .i = HINT_T_CLIPBOARD }, EP_NONE, { "chints", "chi", NULL }, },
   
-  { { "hint_mode_primary",          "Copy to primary",         }, CP_COMMANDLINE | CP_HAS_MODE, 
+  { { "hints_primary",          "Copy to primary",         }, CP_COMMANDLINE | CP_HAS_MODE, 
     (Func)commands_show_hints,          NO_HINTS,                          NEVER_SM,    
     { .n = OPEN_NORMAL, .i = HINT_T_PRIMARY }, EP_NONE, { "phints", "phi", NULL }, },
 
-  { { "hint_mode_rapid",          "Rapid hint mode",         }, CP_COMMANDLINE | CP_HAS_MODE, 
+  { { "hints_rapid",          "Rapid hint mode",         }, CP_COMMANDLINE | CP_HAS_MODE, 
     (Func)commands_show_hints,          NO_HINTS,                          NEVER_SM,    
     { .n = OPEN_NORMAL, .i = HINT_T_RAPID }, EP_NONE, { "rhints", "rhi", NULL }, },
 
-  { { "hint_mode_rapid_nw",          "Rapid hint mode",         }, CP_COMMANDLINE | CP_HAS_MODE, 
+  { { "hints_rapid_win",          "Rapid hint mode",         }, CP_COMMANDLINE | CP_HAS_MODE, 
     (Func)commands_show_hints,          NO_HINTS,                          NEVER_SM,    
     { .n = OPEN_NORMAL, .i = HINT_T_RAPID_NW }, EP_NONE, { "wrhints", "wrhi", NULL }, },
   
-  { { "hint_mode_download",         "Download",                          }, CP_COMMANDLINE | CP_HAS_MODE, 
+  { { "hints_download",         "Download",                          }, CP_COMMANDLINE | CP_HAS_MODE, 
     (Func)commands_show_hints,          NO_HINTS,                          NEVER_SM,    
     { .n = OPEN_DOWNLOAD }, EP_NONE, { "dhints",  }, },
   
@@ -346,19 +345,19 @@ static FunctionMap FMAP [] = {
     (Func)commands_history,     "End of History",                  ALWAYS_SM, 
     { .n = OPEN_NORMAL, .i = 1 }, EP_NONE, { "forward", "fo", NULL }, },
   
-  { { "history_back_nv",          "Go Back",                           }, 1, 
+  { { "tab_hist_back",          "Go Back",                           }, 1, 
     (Func)commands_history,        "Beginning of History",            ALWAYS_SM, 
     { .n = OPEN_NEW_VIEW, .i = -1 }, EP_NONE, { "tabback", "tba", NULL }, },
   
-  { { "history_forward_nv",       "Go Forward",                        }, 1, 
+  { { "tab_hist_forward",       "Go Forward",                        }, 1, 
     (Func)commands_history,     "End of History",                  ALWAYS_SM, 
     { .n = OPEN_NEW_VIEW, .i = 1 }, EP_NONE, { "tabforward", "tfo", NULL }, },
   
-  { { "history_back_nw",          "Go Back",                           }, 1, 
+  { { "win_hist_back",          "Go Back",                           }, 1, 
     (Func)commands_history,        "Beginning of History",            ALWAYS_SM, 
     { .n = OPEN_NEW_WINDOW, .i = -1 }, EP_NONE, { "winback", "wba", NULL }, },
   
-  { { "history_forward_nw",       "Go Forward",                        }, 1, 
+  { { "win_hist_forward",       "Go Forward",                        }, 1, 
     (Func)commands_history,     "End of History",                  ALWAYS_SM, 
     { .n = OPEN_NEW_WINDOW, .i = 1 }, EP_NONE, { "winforward", "wfo", NULL }, },
   
@@ -370,7 +369,7 @@ static FunctionMap FMAP [] = {
     (Func)commands_open,           NULL,                       NEVER_SM,   
     { .i = HTML_STRING, .n = OPEN_NORMAL,      .p = NULL }, EP_NONE, { NULL }, },
   
-  { { "load_html_nv",          "Load html new view",                }, 1, 
+  { { "load_html_tab",          "Load html new tab",                }, 1, 
     (Func)commands_open,           NULL,                       NEVER_SM,   
     { .i = HTML_STRING, .n = OPEN_NEW_VIEW,    .p = NULL }, EP_NONE, { NULL }, },
   
@@ -378,41 +377,41 @@ static FunctionMap FMAP [] = {
     (Func)commands_open,                NULL,                 NEVER_SM,   
     { .n = OPEN_NORMAL,      .p = NULL }, EP_COMP_DEFAULT, { "o", NULL }, },
   
-  { { "Open",                  "open",                              }, CP_COMMANDLINE | CP_HAS_MODE, 
+  { { "open_url",                  "open",                              }, CP_COMMANDLINE | CP_HAS_MODE, 
     (Func)commands_open,                NULL,                 NEVER_SM,   
     { .n = OPEN_NORMAL | SET_URL, .p = NULL }, EP_COMP_DEFAULT, { NULL }, },
   
-  { { "open_nv",               "tabopen",                          }, 1, 
+  { { "tabopen",               "tabopen",                          }, 1, 
     (Func)commands_open,                NULL,                 NEVER_SM,   
-    { .n = OPEN_NEW_VIEW,     .p = NULL }, EP_COMP_DEFAULT, { "t", "tabopen", NULL }, },
+    { .n = OPEN_NEW_VIEW,     .p = NULL }, EP_COMP_DEFAULT, { "t", "topen", NULL }, },
   
-  { { "Open_nv",               "tabopen",                          }, CP_COMMANDLINE | CP_HAS_MODE, 
+  { { "tabopen_url",               "tabopen",                          }, CP_COMMANDLINE | CP_HAS_MODE, 
     (Func)commands_open,                NULL,                 NEVER_SM,   
     { .n = OPEN_NEW_VIEW | SET_URL, .p = NULL }, EP_COMP_DEFAULT, { NULL }, },
   
-  { { "open_nw",               "winopen",                           }, 1, 
+  { { "winopen",               "winopen",                           }, 1, 
     (Func)commands_open,                NULL,                 NEVER_SM,   
-    { .n = OPEN_NEW_WINDOW,     .p = NULL }, EP_COMP_DEFAULT, { "w", "winopen", NULL }, },
+    { .n = OPEN_NEW_WINDOW,     .p = NULL }, EP_COMP_DEFAULT, { "w", "wopen", NULL }, },
   
-  { { "Open_nw",               "winopen",                           }, CP_COMMANDLINE | CP_HAS_MODE, 
+  { { "winopen_url",               "winopen",                           }, CP_COMMANDLINE | CP_HAS_MODE, 
     (Func)commands_open,                NULL,                 NEVER_SM,   
     { .n = OPEN_NEW_WINDOW | SET_URL,     .p = NULL }, EP_COMP_DEFAULT, { NULL }, },
   
-  { { "open_quickmark",        "Open quickmark",                         }, CP_COMMANDLINE | CP_HAS_MODE, 
+  { { "quickmark",        "Open quickmark",                         }, CP_COMMANDLINE | CP_HAS_MODE, 
     (Func)commands_quickmark,           NO_URL,                            NEVER_SM,   
     { .n = QUICK_MARK_OPEN, .i=OPEN_NORMAL }, EP_NONE, { "qmarks", NULL }, },
   
-  { { "open_quickmark_nv",     "Open quickmark in a new tab",                }, CP_COMMANDLINE | CP_HAS_MODE, 
+  { { "tab_quickmark",     "Open quickmark in a new tab",                }, CP_COMMANDLINE | CP_HAS_MODE, 
     (Func)commands_quickmark,           NULL,                              NEVER_SM,    
     { .n = QUICK_MARK_OPEN, .i=OPEN_NEW_VIEW }, EP_NONE, { "tabqmarks", NULL }, },
   
-  { { "open_quickmark_nw",     "Open quickmark in a new window",              }, CP_COMMANDLINE | CP_HAS_MODE, 
+  { { "win_quickmark",     "Open quickmark in a new window",              }, CP_COMMANDLINE | CP_HAS_MODE, 
     (Func)commands_quickmark,           NULL,                              NEVER_SM,    
     { .n = QUICK_MARK_OPEN, .i=OPEN_NEW_WINDOW }, EP_NONE, { "winqmarks", NULL }, },
   
-  { { "open_start_page",       "Open startpage",                    }, 1, 
+  { { "start_page",       "Open startpage",                    }, 1, 
     (Func)commands_open_startpage,      "No startpage set",                ALWAYS_SM, 
-    { 0 }, EP_NONE, { "home", NULL }, },
+    { .p = "dwb://bookmarks" }, EP_NONE, { "home", NULL }, },
   
   { { "quit",           "Quit dwb",               }, 1, 
     (Func)commands_quit,         NULL,                   ALWAYS_SM, 
@@ -430,12 +429,12 @@ static FunctionMap FMAP [] = {
     (Func)commands_stop_loading,       NULL,                              ALWAYS_SM, 
     { 0 }, EP_NONE, { "st", "stop", NULL }, },
   
-  { { "remove_view",           "Close view",                        }, 1, 
+  { { "close_tab",           "Close tab",                        }, 1, 
     (Func)commands_remove_view,         NULL,                              ALWAYS_SM, 
     { 0 }, EP_NONE, { "close", NULL }, },
   
   { { "only",           "Close other tabs except for current",                        }, 1, 
-    (Func)commands_only,         "No other view",                              ALWAYS_SM, 
+    (Func)commands_only,         "No other tab",                              ALWAYS_SM, 
     { 0 }, EP_NONE, { NULL }, },
   
   { { "save_quickmark",        "Save quickmark",    }, CP_COMMANDLINE | CP_HAS_MODE, 
@@ -488,7 +487,7 @@ static FunctionMap FMAP [] = {
   
   { { "set_setting",    "Set setting",               }, CP_COMMANDLINE | CP_HAS_MODE, 
     (Func)commands_set_setting,         NULL,                              NEVER_SM, 
-    { 0 }, EP_NONE, { "set", NULL }, },
+    { 0 }, EP_NONE, { NULL }, },
   
   { { "set_key",               "Set keybinding",                    }, CP_COMMANDLINE | CP_HAS_MODE, 
     (Func)commands_set_key,             NULL,                              NEVER_SM,    
@@ -544,21 +543,21 @@ static FunctionMap FMAP [] = {
     (Func)commands_paste,               "No primary selection",  ALWAYS_SM, 
     { .n = OPEN_NORMAL, .p = GDK_SELECTION_PRIMARY, .ro = true }, EP_NONE, { "ppaste", NULL }, },
   
-  { { "paste_nv",              "Open url from clipboard in a new tab",                   }, 1, 
+  { { "tab_paste",              "Open url from clipboard in a new tab",                   }, 1, 
     (Func)commands_paste,               "Clipboard is empty",    ALWAYS_SM, 
     { .n = OPEN_NEW_VIEW, .p = GDK_NONE, .ro = true }, EP_NONE, { "tabpaste", NULL }, },
   
-  { { "paste_primary_nv",      "Open url from primary selection in a new window", }, 1, 
+  { { "tab_paste_primary",      "Open url from primary selection in a new window", }, 1, 
     (Func)commands_paste,               "No primary selection",  ALWAYS_SM, 
     { .n = OPEN_NEW_VIEW, .p = GDK_SELECTION_PRIMARY, .ro = true }, EP_NONE, { "tabppaste", NULL }, },
   
-  { { "paste_nw",              "Open url from clipboard in a new window",                   }, 1, 
+  { { "win_paste",              "Open url from clipboard in a new window",                   }, 1, 
     (Func)commands_paste,             "Clipboard is empty",    ALWAYS_SM, 
-    { .n = OPEN_NEW_WINDOW, .p = GDK_NONE, .ro = true }, EP_NONE, { "winpaste", NULL }, },
+    { .n = OPEN_NEW_WINDOW, .p = GDK_NONE, .ro = true }, EP_NONE, { "wpaste", NULL }, },
   
-  { { "paste_primary_nw",      "Open url from primary selection in a new window", }, 1, 
+  { { "win_paste_primary",      "Open url from primary selection in a new window", }, 1, 
     (Func)commands_paste,             "No primary selection",  ALWAYS_SM, 
-    { .n = OPEN_NEW_WINDOW, .p = GDK_SELECTION_PRIMARY, .ro = true }, EP_NONE, { "winppaste", NULL }, },
+    { .n = OPEN_NEW_WINDOW, .p = GDK_SELECTION_PRIMARY, .ro = true }, EP_NONE, { "wppaste", NULL }, },
   
 
   { { "save_session",          "Save current session", },              1, 
@@ -713,10 +712,6 @@ static FunctionMap FMAP [] = {
     (Func) commands_fullscreen, NULL,     ALWAYS_SM,    
     { 0 }, EP_NONE, { "fs", NULL }, },
   
-  { { "pass_through",    "Pass-through mode" },                 1, 
-    (Func) commands_pass_through, NULL,     POST_SM,    
-    { 0 }, EP_NONE, { "pthrough", NULL }, },
-  
   { { "open_editor",    "Open external editor" },                 1, 
     (Func) commands_open_editor, "No input focused",     NEVER_SM,    
     { 0 }, EP_NONE, { "editor", NULL }, },
@@ -814,7 +809,7 @@ static WebSettings DWB_SETTINGS[] = {
     SETTING_BUILTIN,  CHAR,    { .p = NULL              }, (S_Func) dwb_webkit_setting,  },
   { { "zoom-step",			                         "The zoom step", },                                               
     SETTING_BUILTIN,  DOUBLE,  { .d = 0.1               }, (S_Func) dwb_webkit_setting,  },
-  { { "custom-encoding",                         "The custom encoding of the view", },                                         
+  { { "custom-encoding",                         "The custom encoding of the tab", },                                         
     SETTING_PER_VIEW,                CHAR,    { .p = NULL           }, (S_Func) dwb_webview_property,  },
   { { "editable",                                "Whether content can be modified", },                                        
     SETTING_PER_VIEW,                BOOLEAN, { .b = false             }, (S_Func) dwb_webview_property,  },
@@ -839,9 +834,9 @@ static WebSettings DWB_SETTINGS[] = {
   { { "scroll-step",			                     "Whether to open tabs in background", },                                 
     SETTING_GLOBAL,      DOUBLE,    { .d = 0         }, (S_Func) dwb_init_vars,  },
 
-  { { "foreground-color",                         "Foreground color of the active view", },                              
+  { { "foreground-color",                         "Foreground color of the active tab", },                              
     SETTING_GLOBAL,  COLOR_CHAR, { .p = "#ffffff"         },    (S_Func) dwb_reload_layout,   },
-  { { "background-color",                         "Background color of the active view", },                              
+  { { "background-color",                         "Background color of the active tab", },                              
     SETTING_GLOBAL,  COLOR_CHAR, { .p = "#000000"         },    (S_Func) dwb_reload_layout,  },
 
   { { "tab-active-fg-color",                     "Foreground color of the active tab", },                           
@@ -949,9 +944,6 @@ static WebSettings DWB_SETTINGS[] = {
   { { "complete-userscripts",                        "Whether to complete userscripts", },                                     
     SETTING_GLOBAL,  BOOLEAN, { .b = false         },     (S_Func)dwb_init_vars,  },
 
-  { { "use-fifo",                        "Create a fifo pipe for communication", },                            
-    SETTING_GLOBAL,  BOOLEAN, { .b = false         },     NULL,  },
-    
   { { "default-width",                           "Default width of the window", },                                           
     SETTING_GLOBAL,  INTEGER, { .i = 800          }, NULL,  },
   { { "default-height",                          "Default height of the window", },                                           
@@ -972,12 +964,10 @@ static WebSettings DWB_SETTINGS[] = {
     SETTING_GLOBAL,  CHAR, { .p = "xterm -e ncftp 'dwb_uri'" }, NULL,   }, 
   { { "editor",                            "External editor", },                                            
     SETTING_GLOBAL,  CHAR, { .p = "xterm -e vim dwb_uri" }, NULL,   }, 
-#ifdef DWB_ADBLOCKER
   { { "adblocker",                               "Whether to block advertisements via a filterlist", },                   
     SETTING_GLOBAL,  BOOLEAN, { .b = false }, (S_Func)dwb_set_adblock,   }, 
   { { "adblocker-filterlist",                    "Path to a filterlist", },                   
     SETTING_GLOBAL,  CHAR, { .p = NULL }, NULL,   }, 
-#endif
   { { "plugin-blocker",                         "Whether to block flash plugins and replace them with a clickable element", },                   
     SETTING_PER_VIEW,  BOOLEAN, { .b = true }, (S_Func)dwb_set_plugin_blocker,   }, 
   { { "plugin-blocker",                         "Whether to block flash plugins and replace them with a clickable element", },