diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp
index 2a440d5712..ae30abf970 100644
--- a/src/LyXAction.cpp
+++ b/src/LyXAction.cpp
@@ -82,23 +82,23 @@ void LyXAction::init()
 	};
 
 	ev_item const items[] = {
-		{ LFUN_ACCENT_ACUTE, "accent-acute", Noop, Layout },
-		{ LFUN_ACCENT_BREVE, "accent-breve", Noop, Layout },
-		{ LFUN_ACCENT_CARON, "accent-caron", Noop, Layout },
-		{ LFUN_ACCENT_CEDILLA, "accent-cedilla", Noop, Layout },
-		{ LFUN_ACCENT_CIRCLE, "accent-circle", Noop, Layout },
-		{ LFUN_ACCENT_CIRCUMFLEX, "accent-circumflex", Noop, Layout },
-		{ LFUN_ACCENT_DOT, "accent-dot", Noop, Layout },
-		{ LFUN_ACCENT_GRAVE, "accent-grave", Noop, Layout },
-		{ LFUN_ACCENT_HUNGARIAN_UMLAUT, "accent-hungarian-umlaut", Noop, Layout },
-		{ LFUN_ACCENT_MACRON, "accent-macron", Noop, Layout },
-		{ LFUN_ACCENT_OGONEK, "accent-ogonek", Noop, Layout },
-		{ LFUN_ACCENT_SPECIAL_CARON, "accent-special-caron", Noop, Layout },
-		{ LFUN_ACCENT_TIE, "accent-tie", Noop, Layout },
-		{ LFUN_ACCENT_TILDE, "accent-tilde", Noop, Layout },
-		{ LFUN_ACCENT_UMLAUT, "accent-umlaut", Noop, Layout },
-		{ LFUN_ACCENT_UNDERBAR, "accent-underbar", Noop, Layout },
-		{ LFUN_ACCENT_UNDERDOT, "accent-underdot", Noop, Layout },
+		{ LFUN_ACCENT_ACUTE, "accent-acute", Noop, Edit },
+		{ LFUN_ACCENT_BREVE, "accent-breve", Noop, Edit },
+		{ LFUN_ACCENT_CARON, "accent-caron", Noop, Edit },
+		{ LFUN_ACCENT_CEDILLA, "accent-cedilla", Noop, Edit },
+		{ LFUN_ACCENT_CIRCLE, "accent-circle", Noop, Edit },
+		{ LFUN_ACCENT_CIRCUMFLEX, "accent-circumflex", Noop, Edit },
+		{ LFUN_ACCENT_DOT, "accent-dot", Noop, Edit },
+		{ LFUN_ACCENT_GRAVE, "accent-grave", Noop, Edit },
+		{ LFUN_ACCENT_HUNGARIAN_UMLAUT, "accent-hungarian-umlaut", Noop, Edit },
+		{ LFUN_ACCENT_MACRON, "accent-macron", Noop, Edit },
+		{ LFUN_ACCENT_OGONEK, "accent-ogonek", Noop, Edit },
+		{ LFUN_ACCENT_SPECIAL_CARON, "accent-special-caron", Noop, Edit },
+		{ LFUN_ACCENT_TIE, "accent-tie", Noop, Edit },
+		{ LFUN_ACCENT_TILDE, "accent-tilde", Noop, Edit },
+		{ LFUN_ACCENT_UMLAUT, "accent-umlaut", Noop, Edit },
+		{ LFUN_ACCENT_UNDERBAR, "accent-underbar", Noop, Edit },
+		{ LFUN_ACCENT_UNDERDOT, "accent-underdot", Noop, Edit },
 
 		{ LFUN_APPENDIX, "appendix", Noop, Edit },
 
@@ -147,12 +147,12 @@ void LyXAction::init()
 		{ LFUN_UP_SELECT, "up-select", ReadOnly | SingleParUpdate, Edit },
 		{ LFUN_SCREEN_DOWN, "screen-down", ReadOnly, Edit },
 		{ LFUN_SCREEN_DOWN_SELECT, "screen-down-select", ReadOnly, Edit },
-		{ LFUN_SCREEN_FONT_UPDATE, "screen-font-update", NoBuffer, Layout },
 		{ LFUN_SCROLL, "scroll", ReadOnly, Edit },
 		{ LFUN_SCREEN_RECENTER, "screen-recenter", ReadOnly, Edit },
 		{ LFUN_SCREEN_UP, "screen-up", ReadOnly, Edit },
 		{ LFUN_SCREEN_UP_SELECT, "screen-up-select", ReadOnly, Edit },
 
+		{ LFUN_ERROR_NEXT, "error-next", ReadOnly, Edit },
 		{ LFUN_CHAR_BACKWARD, "char-backward", ReadOnly | NoUpdate, Edit },
 		{ LFUN_CHAR_BACKWARD_SELECT, "char-backward-select", ReadOnly | SingleParUpdate, Edit },
 		{ LFUN_CHAR_DELETE_BACKWARD, "delete-backward", SingleParUpdate, Edit },
@@ -182,6 +182,10 @@ void LyXAction::init()
 		{ LFUN_WORD_UPCASE, "word-upcase", Noop, Edit },
 		{ LFUN_WORD_FIND, "word-find", ReadOnly, Edit },
 		{ LFUN_WORD_REPLACE, "word-replace", Noop, Edit },
+		{ LFUN_BUFFER_BEGIN, "buffer-begin", ReadOnly, Edit },
+		{ LFUN_BUFFER_BEGIN_SELECT, "buffer-begin-select", ReadOnly, Edit },
+		{ LFUN_BUFFER_END, "buffer-end", ReadOnly, Edit },
+		{ LFUN_BUFFER_END_SELECT, "buffer-end-select", ReadOnly, Edit },
 
 		{ LFUN_LINE_BEGIN, "line-begin", ReadOnly | NoUpdate, Edit },
 		{ LFUN_LINE_BEGIN_SELECT, "line-begin-select", ReadOnly | SingleParUpdate, Edit },
@@ -222,6 +226,7 @@ void LyXAction::init()
 		{ LFUN_FONT_SIZE, "font-size", Noop, Layout },
 		{ LFUN_FONT_STATE, "font-state", ReadOnly, Layout },
 		{ LFUN_FONT_UNDERLINE, "font-underline", Noop, Layout },
+		{ LFUN_SCREEN_FONT_UPDATE, "screen-font-update", NoBuffer, Layout },
 
 		{ LFUN_INDEX_INSERT, "index-insert", Noop, Edit },
 		{ LFUN_INDEX_PRINT, "index-print", Noop, Edit },
@@ -250,6 +255,7 @@ void LyXAction::init()
 		{ LFUN_MARK_OFF, "mark-off", ReadOnly, Edit },
 		{ LFUN_MARK_ON, "mark-on", ReadOnly, Edit },
 		{ LFUN_MARK_TOGGLE, "mark-toggle", ReadOnly, Edit },
+		
 		{ LFUN_MATH_DELIM, "math-delim", Noop, Math },
 		{ LFUN_MATH_BIGDELIM, "math-bigdelim", Noop, Math },
 		{ LFUN_MATH_DISPLAY, "math-display", Noop, Math },
@@ -346,10 +352,9 @@ void LyXAction::init()
 		{ LFUN_BOOKMARK_SAVE, "bookmark-save", ReadOnly, Edit },
 		{ LFUN_BOOKMARK_CLEAR, "bookmark-clear", NoBuffer, Edit },
 
-		{ LFUN_ERROR_NEXT, "error-next", ReadOnly, Edit },
 		{ LFUN_HELP_OPEN, "help-open", NoBuffer | Argument, Buffer },
 		{ LFUN_LYX_QUIT, "lyx-quit", NoBuffer, Buffer },
-		{ LFUN_TOOLBAR_TOGGLE, "toolbar-toggle", NoBuffer, Edit },
+		{ LFUN_TOOLBAR_TOGGLE, "toolbar-toggle", NoBuffer, Buffer },
 		{ LFUN_MENU_OPEN, "menu-open", NoBuffer, Buffer },
 
 		{ LFUN_WINDOW_NEW, "window-new", NoBuffer, Buffer },
@@ -389,15 +394,11 @@ void LyXAction::init()
 		{ LFUN_BUILD_PROGRAM, "build-program", ReadOnly, Buffer },
 
 		{ LFUN_BUFFER_AUTO_SAVE, "buffer-auto-save", Noop, Buffer },
-		{ LFUN_BUFFER_BEGIN, "buffer-begin", ReadOnly, Edit },
-		{ LFUN_BUFFER_BEGIN_SELECT, "buffer-begin-select", ReadOnly, Edit },
 		{ LFUN_BUFFER_CHILD_OPEN, "buffer-child-open", ReadOnly, Buffer },
 		{ LFUN_BUFFER_CHKTEX, "buffer-chktex", ReadOnly, Buffer },
 		{ LFUN_BUFFER_TOGGLE_COMPRESSION, "buffer-toggle-compression", Noop, Buffer },
 		{ LFUN_BUFFER_TOGGLE_EMBEDDING, "buffer-toggle-embedding", Noop, Buffer },
 		{ LFUN_BUFFER_CLOSE, "buffer-close", ReadOnly, Buffer },
-		{ LFUN_BUFFER_END, "buffer-end", ReadOnly, Edit },
-		{ LFUN_BUFFER_END_SELECT, "buffer-end-select", ReadOnly, Edit },
 		{ LFUN_BUFFER_EXPORT, "buffer-export", ReadOnly, Buffer },
 		{ LFUN_BUFFER_EXPORT_CUSTOM, "buffer-export-custom", ReadOnly, Buffer },
 		{ LFUN_BUFFER_PRINT, "buffer-print", ReadOnly, Buffer },
@@ -405,22 +406,22 @@ void LyXAction::init()
 		{ LFUN_BUFFER_NEW, "buffer-new", NoBuffer, Buffer },
 		{ LFUN_BUFFER_NEW_TEMPLATE,"buffer-new-template", NoBuffer, Buffer },
 		{ LFUN_BUFFER_RELOAD, "buffer-reload", ReadOnly, Buffer },
-		{ LFUN_BUFFER_SWITCH, "buffer-switch", NoBuffer | ReadOnly, Edit },
+		{ LFUN_BUFFER_SWITCH, "buffer-switch", NoBuffer | ReadOnly, Buffer },
 		{ LFUN_BUFFER_TOGGLE_READ_ONLY, "buffer-toggle-read-only", ReadOnly, Buffer },
-		{ LFUN_BUFFER_UPDATE, "buffer-update", ReadOnly, Edit },
-		{ LFUN_BUFFER_VIEW, "buffer-view", ReadOnly, Edit },
+		{ LFUN_BUFFER_UPDATE, "buffer-update", ReadOnly, Buffer },
+		{ LFUN_BUFFER_VIEW, "buffer-view", ReadOnly, Buffer },
 		{ LFUN_BUFFER_WRITE, "buffer-write", ReadOnly, Buffer },
 		{ LFUN_BUFFER_WRITE_AS, "buffer-write-as", ReadOnly, Buffer },
 		{ LFUN_BUFFER_WRITE_ALL, "buffer-write-all", ReadOnly, Buffer },
 		{ LFUN_BUFFER_NEXT, "buffer-next", ReadOnly, Buffer },
 		{ LFUN_BUFFER_PREVIOUS, "buffer-previous", ReadOnly, Buffer },
-		{ LFUN_MASTER_BUFFER_UPDATE, "master-buffer-update", ReadOnly, Edit },
-		{ LFUN_MASTER_BUFFER_VIEW, "master-buffer-view", ReadOnly, Edit },
+		{ LFUN_MASTER_BUFFER_UPDATE, "master-buffer-update", ReadOnly, Buffer },
+		{ LFUN_MASTER_BUFFER_VIEW, "master-buffer-view", ReadOnly, Buffer },
 		{ LFUN_BUFFER_LANGUAGE, "buffer-language", Noop, Buffer },
 		{ LFUN_BUFFER_SAVE_AS_DEFAULT, "buffer-save-as-default", Noop, Buffer },
 		{ LFUN_BUFFER_PARAMS_APPLY, "buffer-params-apply", Noop, Buffer },
 
-		{ LFUN_FILE_INSERT, "file-insert", Noop, Buffer },
+		{ LFUN_FILE_INSERT, "file-insert", Noop, Edit },
 		{ LFUN_FILE_INSERT_PLAINTEXT, "file-insert-plaintext", Noop, Edit },
 		{ LFUN_FILE_INSERT_PLAINTEXT_PARA, "file-insert-plaintext-para", Noop, Edit },
 		{ LFUN_FILE_NEW, "file-new", NoBuffer, Buffer },
@@ -435,10 +436,10 @@ void LyXAction::init()
 		{ LFUN_COMMAND_PREFIX, "command-prefix", NoBuffer, Hidden },
 		{ LFUN_COMMAND_SEQUENCE, "command-sequence", NoBuffer, System },
 
-		{ LFUN_PREFERENCES_SAVE, "preferences-save", NoBuffer, Edit },
+		{ LFUN_PREFERENCES_SAVE, "preferences-save", NoBuffer, System },
 		{ LFUN_RECONFIGURE, "reconfigure", NoBuffer, System },
 		{ LFUN_LYXRC_APPLY, "lyxrc-apply", NoBuffer, System },
-		{ LFUN_TOGGLE_CURSOR_FOLLOWS_SCROLLBAR, "toggle-cursor-follows-scrollbar", ReadOnly, Edit },
+		{ LFUN_TOGGLE_CURSOR_FOLLOWS_SCROLLBAR, "toggle-cursor-follows-scrollbar", ReadOnly, System },
 
 		{ LFUN_SET_COLOR, "set-color", ReadOnly | NoBuffer, Edit },
 		{ LFUN_THESAURUS_ENTRY, "thesaurus-entry", ReadOnly, Edit },