diff --git a/black_theme.xml b/black_theme.xml
index 09308e7..0d5f47f 100644
--- a/black_theme.xml
+++ b/black_theme.xml
@@ -222,7 +222,7 @@
 		ConfirmDelete="1"
 		BlockBinaryFiles="1"
 		OpenBackupsAsReadOnly="1"
-		DefaultFileFormat="1"
+		DefaultFileFormat="2"
 		DefaultEncoding="65001"
 		FileOpenAction="Project File List"
 		/>
@@ -447,214 +447,214 @@
 	</Menus>
 	<Keymaps>
 		<Main>
-			<item Command="Simple Tab" Keycode="(CA)Tab" />
-			<item Command="Back Tab" Keycode="(S)Tab" />
-			<item Command="Tab" Keycode="Tab" />
-			<item Command="Enter" Keycode="(N)Enter" />
-			<item Command="Enter" Keycode="Enter" />
-			<item Command="Enter" Keycode="Enter" />
-			<item Command="Symbol Info..." Keycode="(C)mouse(R+SEL)" />
-			<item Command="Make Column Selection" Keycode="(A)mouse(L)" />
-			<item Command="Select To" Keycode="(S)mouse(L)" />
-			<item Command="Copy" Keycode="mouse(LR)" />
-			<item Command="Zoom Out" Keycode="(CS)," />
-			<item Command="Zoom In" Keycode="(CS)." />
-			<item Command="Redraw Screen" Keycode="(CA)Space" />
-			<item Command="Toggle Comment Lines" Keycode="(C)7" />
-			<item Command="Drag Line Down" Keycode="(C)Down" />
-			<item Command="Drag Line Up" Keycode="(C)Up" />
-			<item Command="Restore Lines" Keycode="(A)D" />
-			<item Command="Paste From Clip..." Keycode="(C)Ins" />
-			<item Command="Copy To Clip..." Keycode="(C)Del" />
-			<item Command="Cut To Clip..." Keycode="(CS)X" />
-			<item Command="Insert New Line" Keycode="(C)Enter" />
-			<item Command="Join Lines" Keycode="(C)J" />
-			<item Command="Insert Line Before Next" Keycode="(C)Space" />
-			<item Command="Cut Word" Keycode="(C)," />
-			<item Command="Cut Line Right" Keycode="(C);" />
-			<item Command="Insert Line" Keycode="(C)I" />
-			<item Command="Cut Line" Keycode="(C)U" />
-			<item Command="Paste Line" Keycode="(C)P" />
-			<item Command="Copy Line Right" Keycode="(CS)K" />
-			<item Command="Copy Line" Keycode="(C)K" />
-			<item Command="Delete Character" Keycode="(N)Del" />
-			<item Command="Delete Character" Keycode="Del" />
-			<item Command="Backspace" Keycode="(S)BackSpace" />
-			<item Command="Backspace" Keycode="BackSpace" />
-			<item Command="Synchronize Files..." Keycode="(AS)S" />
-			<item Command="Remove File..." Keycode="(AS)R" />
-			<item Command="Add File..." Keycode="(AS)A" />
-			<item Command="Close Project" Keycode="(AS)W" />
-			<item Command="Open Project..." Keycode="(AS)P" />
-			<item Command="New Project..." Keycode="(AS)N" />
-			<item Command="Incremental Search..." Keycode="(C)," />
-			<item Command="Complete Symbol" Keycode="(C)8" />
-			<item Command="Complete Snippet" Keycode="(C)E" />
-			<item Command="Smart Rename..." Keycode="(C)&apos;" />
-			<item Command="File Type Options..." Keycode="(A)Y" />
-			<item Command="Last Window" Keycode="(CS)Tab" />
-			<item Command="Last Window" Keycode="(C)Tab" />
-			<item Command="Symbol Info..." Keycode="(A)/" />
-			<item Command="Selection History..." Keycode="(CS)M" />
-			<item Command="Bookmark..." Keycode="(C)M" />
-			<item Command="Toggle Insert Mode" Keycode="Ins" />
-			<item Command="Jump To Reference" Keycode="(CA)L" />
-			<item Command="Jump To Caller" Keycode="(CA)C" />
-			<item Command="Jump To Base Type" Keycode="(A)0" />
-			<item Command="Jump To Prototype..." Keycode="(A)-" />
-			<item Command="Jump To Definition" Keycode="(C)=" />
-			<item Command="Go To First Link" Keycode="(CS)L" />
-			<item Command="Go To Previous Link" Keycode="(S)F8" />
-			<item Command="Go To Next Link" Keycode="(S)F9" />
-			<item Command="Jump To Link" Keycode="(C)L" />
-			<item Command="Go To Line..." Keycode="(C)G" />
-			<item Command="Replace Files..." Keycode="(CS)H" />
-			<item Command="Replace..." Keycode="(C)H" />
-			<item Command="Activate Project Search Bar" Keycode="(AS)P" />
-			<item Command="Activate Search Bar" Keycode="(AS)F" />
-			<item Command="Search Web..." Keycode="(CA)W" />
-			<item Command="Lookup References..." Keycode="(C)/" />
-			<item Command="Search Files..." Keycode="(CS)F" />
-			<item Command="Search..." Keycode="(C)F" />
-			<item Command="Renumber..." Keycode="(C)R" />
-			<item Command="Activate Symbol Window" Keycode="(A)L" />
-			<item Command="Activate Project Symbol List" Keycode="(A)G" />
-			<item Command="Reload File" Keycode="(CS)O" />
-			<item Command="Save As..." Keycode="(CS)S" />
-			<item Command="Save All" Keycode="(CA)A" />
-			<item Command="Save" Keycode="(C)S" />
-			<item Command="Next File..." Keycode="(CS)N" />
-			<item Command="Close All" Keycode="(CS)W" />
-			<item Command="Close" Keycode="(C)W" />
-			<item Command="Open..." Keycode="(C)O" />
-			<item Command="New" Keycode="(C)N" />
-			<item Command="Repeat Typing" Keycode="(C)\" />
-			<item Command="Go Forward" Keycode="mouse(T2)" />
-			<item Command="Go Back" Keycode="mouse(T1)" />
-			<item Command="Go Forward" Keycode="(A)." />
-			<item Command="Go Back" Keycode="(A)," />
-			<item Command="Go Back Toggle" Keycode="(A)M" />
-			<item Command="Beginning Of Selection" Keycode="(CA)[" />
-			<item Command="End Of Selection" Keycode="(CA)]" />
-			<item Command="Select Sentence" Keycode="(C)." />
-			<item Command="Block Down" Keycode="(CS)]" />
-			<item Command="Block Up" Keycode="(CS)[" />
-			<item Command="Paren Right" Keycode="(C)0" />
-			<item Command="Paren Left" Keycode="(C)9" />
-			<item Command="Jump To Match" Keycode="(A)]" />
-			<item Command="Go To Previous Change" Keycode="(AN)-" />
-			<item Command="Go To Next Change" Keycode="(AN)+" />
-			<item Command="Select Match" Keycode="(A)=" />
-			<item Command="Select Block" Keycode="(C)-" />
-			<item Command="Function Down" Keycode="(N)+" />
-			<item Command="Function Up" Keycode="(N)-" />
-			<item Command="Word Right" Keycode="(C)Right" />
-			<item Command="Word Left" Keycode="(C)Left" />
-			<item Command="Cursor Right" Keycode="(N)Right" />
-			<item Command="Cursor Right" Keycode="Right" />
-			<item Command="Cursor Left" Keycode="(N)Left" />
-			<item Command="Cursor Left" Keycode="Left" />
-			<item Command="Cursor Down" Keycode="(N)Down" />
-			<item Command="Cursor Down" Keycode="Down" />
-			<item Command="Cursor Up" Keycode="(N)Up" />
-			<item Command="Cursor Up" Keycode="Up" />
-			<item Command="Bottom Of Window" Keycode="(N)End" />
-			<item Command="End Of Line" Keycode="End" />
-			<item Command="Top Of Window" Keycode="(N)Home" />
-			<item Command="Beginning Of Line" Keycode="Home" />
-			<item Command="Bottom Of File" Keycode="(CN)End" />
-			<item Command="Bottom Of File" Keycode="(C)End" />
-			<item Command="Top Of File" Keycode="(CN)Home" />
-			<item Command="Top Of File" Keycode="(C)Home" />
-			<item Command="Scroll Right" Keycode="(A)Right" />
-			<item Command="Scroll Left" Keycode="(A)Left" />
-			<item Command="Scroll Line Down" Keycode="(A)Down" />
-			<item Command="Scroll Line Up" Keycode="(A)Up" />
-			<item Command="Scroll Half Page Up" Keycode="(N)/" />
-			<item Command="Scroll Half Page Up" Keycode="(CN)PgUp" />
-			<item Command="Scroll Half Page Up" Keycode="(C)PgUp" />
-			<item Command="Scroll Half Page Down" Keycode="(N)*" />
-			<item Command="Scroll Half Page Down" Keycode="(CN)PgDn" />
-			<item Command="Scroll Half Page Down" Keycode="(C)PgDn" />
-			<item Command="Page Down" Keycode="(N)PgDn" />
-			<item Command="Page Down" Keycode="PgDn" />
-			<item Command="Page Up" Keycode="(N)PgUp" />
-			<item Command="Page Up" Keycode="PgUp" />
-			<item Command="Select To End Of File" Keycode="(CS)End" />
-			<item Command="Select To Top Of File" Keycode="(CS)Home" />
-			<item Command="Select Page Up" Keycode="(SN)PgUp" />
-			<item Command="Select Page Up" Keycode="(S)PgUp" />
-			<item Command="Select Page Down" Keycode="(SN)PgDn" />
-			<item Command="Select Page Down" Keycode="(S)PgDn" />
-			<item Command="Select Line Down" Keycode="(S)Down" />
-			<item Command="Select Line Up" Keycode="(S)Up" />
-			<item Command="Select Char Right" Keycode="(S)Right" />
-			<item Command="Select Char Left" Keycode="(S)Left" />
-			<item Command="Select Word Right" Keycode="(CS)Right" />
-			<item Command="Select Word Left" Keycode="(CS)Left" />
-			<item Command="Select To Start Of Line" Keycode="(S)Home" />
-			<item Command="Select To End Of Line" Keycode="(S)End" />
-			<item Command="Activate Tools Menu" Keycode="(A)T" />
-			<item Command="Activate Work Menu" Keycode="(A)K" />
-			<item Command="Activate System Menu" Keycode="(A)Space" />
-			<item Command="Activate System Doc Menu" Keycode="(A)-" />
-			<item Command="Activate View Menu" Keycode="(A)V" />
-			<item Command="Activate Options Menu" Keycode="(A)O" />
-			<item Command="Activate Help Menu" Keycode="(A)H" />
-			<item Command="Activate Window Menu" Keycode="(A)W" />
-			<item Command="Activate Project Menu" Keycode="(A)P" />
-			<item Command="Activate Search Menu" Keycode="(A)S" />
-			<item Command="Activate Edit Menu" Keycode="(A)E" />
-			<item Command="Activate File Menu" Keycode="(A)F" />
-			<item Command="Select All" Keycode="(C)A" />
-			<item Command="Cut" Keycode="(S)Del" />
-			<item Command="Paste" Keycode="(S)Ins" />
-			<item Command="Paste" Keycode="(C)V" />
-			<item Command="Copy" Keycode="(C)C" />
-			<item Command="Cut" Keycode="(C)X" />
-			<item Command="Redo" Keycode="(C)Y" />
-			<item Command="Undo" Keycode="(A)BackSpace" />
-			<item Command="Undo" Keycode="(C)Z" />
-			<item Command="Zoom Window" Keycode="(C)F10" />
-			<item Command="Select Next Window" Keycode="(C)F6" />
-			<item Command="Close Window" Keycode="(C)F4" />
-			<item Command="Play Recording" Keycode="(C)F3" />
-			<item Command="Stop Recording" Keycode="(C)F2" />
-			<item Command="Start Recording" Keycode="(C)F1" />
-			<item Command="Show File Status" Keycode="(S)F10" />
-			<item Command="Activate Snippet Window" Keycode="(CA)S" />
-			<item Command="Select Next Snippet Placeholder" Keycode="(CS);" />
-			<item Command="Select Sentence" Keycode="(S)F7" />
-			<item Command="Select Line" Keycode="(S)F6" />
-			<item Command="Select Word" Keycode="(S)F5" />
-			<item Command="Search Forward for Selection" Keycode="(S)F4" />
-			<item Command="Search Backward for Selection" Keycode="(S)F3" />
-			<item Command="Select Next Window" Keycode="(S)F2" />
-			<item Command="Select Previous Window" Keycode="(S)F1" />
-			<item Command="Zoom Window" Keycode="(A)F10" />
-			<item Command="Symbol Window" Keycode="(A)F8" />
-			<item Command="Sort Symbol Window" Keycode="(A)F7" />
-			<item Command="Close Window" Keycode="(A)F6" />
-			<item Command="New Window" Keycode="(A)F5" />
-			<item Command="Exit" Keycode="(A)F4" />
-			<item Command="SDK Help..." Keycode="(A)F1" />
-			<item Command="Mono Font View" Keycode="(A)F12" />
-			<item Command="Incremental Search..." Keycode="F12" />
-			<item Command="Full Screen" Keycode="F11" />
-			<item Command="Indent Right" Keycode="F10" />
-			<item Command="Indent Left" Keycode="F9" />
-			<item Command="Highlight Word" Keycode="F8" />
-			<item Command="Activate Project Symbol List" Keycode="F7" />
-			<item Command="Tile Two Windows" Keycode="F6" />
-			<item Command="Go To Line..." Keycode="F5" />
-			<item Command="Search Forward" Keycode="F4" />
-			<item Command="Search Backward" Keycode="F3" />
-			<item Command="Select Next Window" Keycode="F2" />
-			<item Command="Help..." Keycode="F1" />
-			<item Command="Load Layout D" Keycode="(CS)F4" />
-			<item Command="Load Layout C" Keycode="(CS)F3" />
-			<item Command="Load Layout B" Keycode="(CS)F2" />
 			<item Command="Load Layout A" Keycode="(CS)F1" />
+			<item Command="Load Layout B" Keycode="(CS)F2" />
+			<item Command="Load Layout C" Keycode="(CS)F3" />
+			<item Command="Load Layout D" Keycode="(CS)F4" />
+			<item Command="Help..." Keycode="F1" />
+			<item Command="Select Next Window" Keycode="F2" />
+			<item Command="Search Backward" Keycode="F3" />
+			<item Command="Search Forward" Keycode="F4" />
+			<item Command="Go To Line..." Keycode="F5" />
+			<item Command="Tile Two Windows" Keycode="F6" />
+			<item Command="Activate Project Symbol List" Keycode="F7" />
+			<item Command="Highlight Word" Keycode="F8" />
+			<item Command="Indent Left" Keycode="F9" />
+			<item Command="Indent Right" Keycode="F10" />
+			<item Command="Full Screen" Keycode="F11" />
+			<item Command="Incremental Search..." Keycode="F12" />
+			<item Command="Mono Font View" Keycode="(A)F12" />
+			<item Command="SDK Help..." Keycode="(A)F1" />
+			<item Command="Exit" Keycode="(A)F4" />
+			<item Command="New Window" Keycode="(A)F5" />
+			<item Command="Close Window" Keycode="(A)F6" />
+			<item Command="Sort Symbol Window" Keycode="(A)F7" />
+			<item Command="Symbol Window" Keycode="(A)F8" />
+			<item Command="Zoom Window" Keycode="(A)F10" />
+			<item Command="Select Previous Window" Keycode="(S)F1" />
+			<item Command="Select Next Window" Keycode="(S)F2" />
+			<item Command="Search Backward for Selection" Keycode="(S)F3" />
+			<item Command="Search Forward for Selection" Keycode="(S)F4" />
+			<item Command="Select Word" Keycode="(S)F5" />
+			<item Command="Select Line" Keycode="(S)F6" />
+			<item Command="Select Sentence" Keycode="(S)F7" />
+			<item Command="Select Next Snippet Placeholder" Keycode="(CS);" />
+			<item Command="Activate Snippet Window" Keycode="(CA)S" />
+			<item Command="Show File Status" Keycode="(S)F10" />
+			<item Command="Start Recording" Keycode="(C)F1" />
+			<item Command="Stop Recording" Keycode="(C)F2" />
+			<item Command="Play Recording" Keycode="(C)F3" />
+			<item Command="Close Window" Keycode="(C)F4" />
+			<item Command="Select Next Window" Keycode="(C)F6" />
+			<item Command="Zoom Window" Keycode="(C)F10" />
+			<item Command="Undo" Keycode="(C)Z" />
+			<item Command="Undo" Keycode="(A)BackSpace" />
+			<item Command="Redo" Keycode="(C)Y" />
+			<item Command="Cut" Keycode="(C)X" />
+			<item Command="Copy" Keycode="(C)C" />
+			<item Command="Paste" Keycode="(C)V" />
+			<item Command="Paste" Keycode="(S)Ins" />
+			<item Command="Cut" Keycode="(S)Del" />
+			<item Command="Select All" Keycode="(C)A" />
+			<item Command="Activate File Menu" Keycode="(A)F" />
+			<item Command="Activate Edit Menu" Keycode="(A)E" />
+			<item Command="Activate Search Menu" Keycode="(A)S" />
+			<item Command="Activate Project Menu" Keycode="(A)P" />
+			<item Command="Activate Window Menu" Keycode="(A)W" />
+			<item Command="Activate Help Menu" Keycode="(A)H" />
+			<item Command="Activate Options Menu" Keycode="(A)O" />
+			<item Command="Activate View Menu" Keycode="(A)V" />
+			<item Command="Activate System Doc Menu" Keycode="(A)-" />
+			<item Command="Activate System Menu" Keycode="(A)Space" />
+			<item Command="Activate Work Menu" Keycode="(A)K" />
+			<item Command="Activate Tools Menu" Keycode="(A)T" />
+			<item Command="Select To End Of Line" Keycode="(S)End" />
+			<item Command="Select To Start Of Line" Keycode="(S)Home" />
+			<item Command="Select Word Left" Keycode="(CS)Left" />
+			<item Command="Select Word Right" Keycode="(CS)Right" />
+			<item Command="Select Char Left" Keycode="(S)Left" />
+			<item Command="Select Char Right" Keycode="(S)Right" />
+			<item Command="Select Line Up" Keycode="(S)Up" />
+			<item Command="Select Line Down" Keycode="(S)Down" />
+			<item Command="Select Page Down" Keycode="(S)PgDn" />
+			<item Command="Select Page Down" Keycode="(SN)PgDn" />
+			<item Command="Select Page Up" Keycode="(S)PgUp" />
+			<item Command="Select Page Up" Keycode="(SN)PgUp" />
+			<item Command="Select To Top Of File" Keycode="(CS)Home" />
+			<item Command="Select To End Of File" Keycode="(CS)End" />
+			<item Command="Page Up" Keycode="PgUp" />
+			<item Command="Page Up" Keycode="(N)PgUp" />
+			<item Command="Page Down" Keycode="PgDn" />
+			<item Command="Page Down" Keycode="(N)PgDn" />
+			<item Command="Scroll Half Page Down" Keycode="(C)PgDn" />
+			<item Command="Scroll Half Page Down" Keycode="(CN)PgDn" />
+			<item Command="Scroll Half Page Down" Keycode="(N)*" />
+			<item Command="Scroll Half Page Up" Keycode="(C)PgUp" />
+			<item Command="Scroll Half Page Up" Keycode="(CN)PgUp" />
+			<item Command="Scroll Half Page Up" Keycode="(N)/" />
+			<item Command="Scroll Line Up" Keycode="(A)Up" />
+			<item Command="Scroll Line Down" Keycode="(A)Down" />
+			<item Command="Scroll Left" Keycode="(A)Left" />
+			<item Command="Scroll Right" Keycode="(A)Right" />
+			<item Command="Top Of File" Keycode="(C)Home" />
+			<item Command="Top Of File" Keycode="(CN)Home" />
+			<item Command="Bottom Of File" Keycode="(C)End" />
+			<item Command="Bottom Of File" Keycode="(CN)End" />
+			<item Command="Beginning Of Line" Keycode="Home" />
+			<item Command="Top Of Window" Keycode="(N)Home" />
+			<item Command="End Of Line" Keycode="End" />
+			<item Command="Bottom Of Window" Keycode="(N)End" />
+			<item Command="Cursor Up" Keycode="Up" />
+			<item Command="Cursor Up" Keycode="(N)Up" />
+			<item Command="Cursor Down" Keycode="Down" />
+			<item Command="Cursor Down" Keycode="(N)Down" />
+			<item Command="Cursor Left" Keycode="Left" />
+			<item Command="Cursor Left" Keycode="(N)Left" />
+			<item Command="Cursor Right" Keycode="Right" />
+			<item Command="Cursor Right" Keycode="(N)Right" />
+			<item Command="Word Left" Keycode="(C)Left" />
+			<item Command="Word Right" Keycode="(C)Right" />
+			<item Command="Function Up" Keycode="(N)-" />
+			<item Command="Function Down" Keycode="(N)+" />
+			<item Command="Select Block" Keycode="(C)-" />
+			<item Command="Select Match" Keycode="(A)=" />
+			<item Command="Go To Next Change" Keycode="(AN)+" />
+			<item Command="Go To Previous Change" Keycode="(AN)-" />
+			<item Command="Jump To Match" Keycode="(A)]" />
+			<item Command="Paren Left" Keycode="(C)9" />
+			<item Command="Paren Right" Keycode="(C)0" />
+			<item Command="Block Up" Keycode="(CS)[" />
+			<item Command="Block Down" Keycode="(CS)]" />
+			<item Command="Select Sentence" Keycode="(C)." />
+			<item Command="End Of Selection" Keycode="(CA)]" />
+			<item Command="Beginning Of Selection" Keycode="(CA)[" />
+			<item Command="Go Back Toggle" Keycode="(A)M" />
+			<item Command="Go Back" Keycode="(A)," />
+			<item Command="Go Forward" Keycode="(A)." />
+			<item Command="Go Back" Keycode="mouse(T1)" />
+			<item Command="Go Forward" Keycode="mouse(T2)" />
+			<item Command="Repeat Typing" Keycode="(C)\" />
+			<item Command="New" Keycode="(C)N" />
+			<item Command="Open..." Keycode="(C)O" />
+			<item Command="Close" Keycode="(C)W" />
+			<item Command="Close All" Keycode="(CS)W" />
+			<item Command="Next File..." Keycode="(CS)N" />
+			<item Command="Save" Keycode="(C)S" />
+			<item Command="Save All" Keycode="(CA)A" />
+			<item Command="Save As..." Keycode="(CS)S" />
+			<item Command="Reload File" Keycode="(CS)O" />
+			<item Command="Activate Project Symbol List" Keycode="(A)G" />
+			<item Command="Activate Symbol Window" Keycode="(A)L" />
+			<item Command="Renumber..." Keycode="(C)R" />
+			<item Command="Search..." Keycode="(C)F" />
+			<item Command="Search Files..." Keycode="(CS)F" />
+			<item Command="Lookup References..." Keycode="(C)/" />
+			<item Command="Search Web..." Keycode="(CA)W" />
+			<item Command="Activate Search Bar" Keycode="(AS)F" />
+			<item Command="Activate Project Search Bar" Keycode="(AS)P" />
+			<item Command="Replace..." Keycode="(C)H" />
+			<item Command="Replace Files..." Keycode="(CS)H" />
+			<item Command="Go To Line..." Keycode="(C)G" />
+			<item Command="Jump To Link" Keycode="(C)L" />
+			<item Command="Go To Next Link" Keycode="(S)F9" />
+			<item Command="Go To Previous Link" Keycode="(S)F8" />
+			<item Command="Go To First Link" Keycode="(CS)L" />
+			<item Command="Jump To Definition" Keycode="(C)=" />
+			<item Command="Jump To Prototype..." Keycode="(A)-" />
+			<item Command="Jump To Base Type" Keycode="(A)0" />
+			<item Command="Jump To Caller" Keycode="(CA)C" />
+			<item Command="Jump To Reference" Keycode="(CA)L" />
+			<item Command="Toggle Insert Mode" Keycode="Ins" />
+			<item Command="Bookmark..." Keycode="(C)M" />
+			<item Command="Selection History..." Keycode="(CS)M" />
+			<item Command="Symbol Info..." Keycode="(A)/" />
+			<item Command="Last Window" Keycode="(C)Tab" />
+			<item Command="Last Window" Keycode="(CS)Tab" />
+			<item Command="File Type Options..." Keycode="(A)Y" />
+			<item Command="Smart Rename..." Keycode="(C)&apos;" />
+			<item Command="Complete Snippet" Keycode="(C)E" />
+			<item Command="Complete Symbol" Keycode="(C)8" />
+			<item Command="Incremental Search..." Keycode="(C)," />
+			<item Command="New Project..." Keycode="(AS)N" />
+			<item Command="Open Project..." Keycode="(AS)P" />
+			<item Command="Close Project" Keycode="(AS)W" />
+			<item Command="Add File..." Keycode="(AS)A" />
+			<item Command="Remove File..." Keycode="(AS)R" />
+			<item Command="Synchronize Files..." Keycode="(AS)S" />
+			<item Command="Backspace" Keycode="BackSpace" />
+			<item Command="Backspace" Keycode="(S)BackSpace" />
+			<item Command="Delete Character" Keycode="Del" />
+			<item Command="Delete Character" Keycode="(N)Del" />
+			<item Command="Copy Line" Keycode="(C)K" />
+			<item Command="Copy Line Right" Keycode="(CS)K" />
+			<item Command="Paste Line" Keycode="(C)P" />
+			<item Command="Cut Line" Keycode="(C)U" />
+			<item Command="Insert Line" Keycode="(C)I" />
+			<item Command="Cut Line Right" Keycode="(C);" />
+			<item Command="Cut Word" Keycode="(C)," />
+			<item Command="Insert Line Before Next" Keycode="(C)Space" />
+			<item Command="Join Lines" Keycode="(C)J" />
+			<item Command="Insert New Line" Keycode="(C)Enter" />
+			<item Command="Cut To Clip..." Keycode="(CS)X" />
+			<item Command="Copy To Clip..." Keycode="(C)Del" />
+			<item Command="Paste From Clip..." Keycode="(C)Ins" />
+			<item Command="Restore Lines" Keycode="(A)D" />
+			<item Command="Drag Line Up" Keycode="(C)Up" />
+			<item Command="Drag Line Down" Keycode="(C)Down" />
+			<item Command="Toggle Comment Lines" Keycode="(C)7" />
+			<item Command="Redraw Screen" Keycode="(CA)Space" />
+			<item Command="Zoom In" Keycode="(CS)." />
+			<item Command="Zoom Out" Keycode="(CS)," />
+			<item Command="Copy" Keycode="mouse(LR)" />
+			<item Command="Select To" Keycode="(S)mouse(L)" />
+			<item Command="Make Column Selection" Keycode="(A)mouse(L)" />
+			<item Command="Symbol Info..." Keycode="(C)mouse(R+SEL)" />
+			<item Command="Enter" Keycode="Enter" />
+			<item Command="Enter" Keycode="Enter" />
+			<item Command="Enter" Keycode="(N)Enter" />
+			<item Command="Tab" Keycode="Tab" />
+			<item Command="Back Tab" Keycode="(S)Tab" />
+			<item Command="Simple Tab" Keycode="(CA)Tab" />
 		</Main>
 	</Keymaps>
 	<CustomCommands>
@@ -2182,12 +2182,17 @@
 			TextColor="#aaaa00"
 			ParentStyle="Declaration"
 			/>
-		<Style Name="Declare Macro" ParentStyle="Declaration" />
+		<Style
+			Name="Declare Macro"
+			TextColor="#ef5656"
+			ParentStyle="Declaration"
+			/>
 		<Style
 			Name="Declare Struct"
-			ParentStyle="Declaration"
+			Scale="140"
 			KeepWithNextLine="1"
-			TextColor="#37a6e1"
+			TextColor="#eaea15"
+			ParentStyle="Declaration"
 			/>
 		<Style Name="Declare Union" ParentStyle="Declare Struct" />
 		<Style
@@ -2207,7 +2212,12 @@
 			TextColor="#ef5656"
 			ParentStyle="Declaration"
 			/>
-		<Style Name="Declare Enum" ParentStyle="Declare Struct" />
+		<Style
+			Name="Declare Enum"
+			FontSizeQps="56"
+			TextColor="#37a6e1"
+			ParentStyle="Declare Struct"
+			/>
 		<Style
 			Name="Declare Enum Const"
 			TextColor="#ef5656"
@@ -2224,9 +2234,9 @@
 			/>
 		<Style
 			Name="Label"
-			TextColor="#ff0000"
-			Scale="110"
+			Scale="100"
 			Underline="Single"
+			TextColor="#ff0000"
 			ParentStyle="Declaration"
 			/>
 		<Style Name="Declare Interface" ParentStyle="Declare Class" />
@@ -2241,7 +2251,7 @@
 			/>
 		<Style
 			Name="Ref to Macro"
-			TextColor="#bfbf00"
+			TextColor="#aaaa00"
 			ParentStyle="Ref to Func"
 			/>
 		<Style
@@ -2275,7 +2285,11 @@
 		<Style Name="Ref to Proto" ParentStyle="Ref to Func" />
 		<Style Name="Ref to Preproc" ParentStyle="Reference" />
 		<Style Name="Ref to Search" ParentStyle="Reference" />
-		<Style Name="Ref to Label" ParentStyle="Reference" />
+		<Style
+			Name="Ref to Label"
+			TextColor="#ff0000"
+			ParentStyle="Reference"
+			/>
 		<Style
 			Name="Ref to Member"
 			Italic="0"