diff --git a/IDE/src/IDEApp.bf b/IDE/src/IDEApp.bf
index b55b70377..23b0ce399 100644
--- a/IDE/src/IDEApp.bf
+++ b/IDE/src/IDEApp.bf
@@ -6063,7 +6063,13 @@ namespace IDE
 		{
 			scope AutoBeefPerf("IDEApp.CreateMenu");
 
-			SysMenu root = mMainWindow.mSysMenu;
+			SysMenu root;
+#if BF_PLATFORM_WINDOWS
+			root = mMainWindow.mSysMenu;
+#else
+			root = mMainFrame.mMenuBar.mSysMenuRoot;
+			defer mMainFrame.RehupSize();
+#endif
 
 			String keyStr = scope String();
 
@@ -6147,11 +6153,18 @@ namespace IDE
 
 			void AddLineEndingKind(String name, LineEndingKind lineEndingKind)
 			{
+				bool allowLast;
+#if !BF_PLATFORM_WINDOWS
+				allowLast = true;
+#else
+				allowLast = false;
+#endif
+
 				lineEndingMenu.AddMenuItem(name, null,
 					new (menu) =>
 					{
 						var sysMenu = (SysMenu)menu;
-						var sourceViewPanel = GetActiveSourceViewPanel();
+						var sourceViewPanel = GetActiveSourceViewPanel(allowLast);
 						if (sourceViewPanel != null)
 						{
 							if (sourceViewPanel.mEditData.mLineEndingKind != lineEndingKind)
@@ -6166,7 +6179,7 @@ namespace IDE
 					{
 						var sysMenu = (SysMenu)menu;
 
-						var sourceViewPanel = GetActiveSourceViewPanel();
+						var sourceViewPanel = GetActiveSourceViewPanel(allowLast);
 						if (sourceViewPanel != null)
 						{
 							sysMenu.Modify(null, null, null, true, (sourceViewPanel.mEditData.mLineEndingKind == lineEndingKind) ? 1 : 0, true);
diff --git a/IDE/src/ui/MainFrame.bf b/IDE/src/ui/MainFrame.bf
index 3df50c1e5..d76fcdd32 100644
--- a/IDE/src/ui/MainFrame.bf
+++ b/IDE/src/ui/MainFrame.bf
@@ -15,7 +15,7 @@ namespace IDE.ui
         public StatusBar mStatusBar;
         public DarkDockingFrame mDockingFrame;
 
-#if BF_PLATFORM_LINUX
+#if !BF_PLATFORM_WINDOWS
 		public MenuBar mMenuBar;
 #endif
 
@@ -25,7 +25,7 @@ namespace IDE.ui
             AddWidget(mStatusBar);
             mDockingFrame = (DarkDockingFrame)ThemeFactory.mDefault.CreateDockingFrame();
             AddWidget(mDockingFrame);
-#if BF_PLATFORM_LINUX
+#if !BF_PLATFORM_WINDOWS
 			mMenuBar = new MenuBar();
 			AddWidget(mMenuBar);
 #endif
@@ -50,7 +50,7 @@ namespace IDE.ui
             base.Resize(x, y, width, height);
 
 			int32 statusHeight = GS!(20);
-#if BF_PLATFORM_LINUX
+#if !BF_PLATFORM_WINDOWS
 			int32 menuHeight = GS!(20);
 			mDockingFrame.Resize(0, menuHeight, width, height - statusHeight - menuHeight);
 			mMenuBar.Resize(0, 0, width, menuHeight);
diff --git a/IDE/src/ui/MenuBar.bf b/IDE/src/ui/MenuBar.bf
index 77e0205bb..9aa42a9ee 100644
--- a/IDE/src/ui/MenuBar.bf
+++ b/IDE/src/ui/MenuBar.bf
@@ -7,11 +7,107 @@ using IDE;
 using IDE.util;
 using System;
 using System.Diagnostics;
+using System.Collections;
+using Beefy.sys;
 
 namespace IDE.ui;
 
 public class MenuBar : Widget
 {
+	class UISysMenu : SysMenu
+	{
+		public override SysMenu AddMenuItem(String text, String hotKey = null, MenuItemSelectedHandler menuItemSelectedHandler = null,
+			MenuItemUpdateHandler menuItemUpdateHandler = null, SysBitmap bitmap = null, bool enabled = true, int32 checkState = -1, bool radioCheck = false)
+		{
+			if (mChildren == null)
+			    mChildren = new List<SysMenu>();
+
+			UISysMenu sysMenu = new UISysMenu();
+			if (text != null)
+			{
+				sysMenu.mText = new String(text);
+				let bindIndex = sysMenu.mText.IndexOf('&');
+				if (bindIndex != -1)
+					sysMenu.mText.Remove(bindIndex);
+			}
+			if ((hotKey != null) && (hotKey.Length != 0) && ((hotKey.Length > 1 ) || (hotKey[0] != '#')))
+			{
+				sysMenu.mHotKey = new String(hotKey);
+				sysMenu.mHotKey.TrimStart('#');
+			}
+
+			sysMenu.mBitmap = bitmap;
+			sysMenu.mEnabled = enabled;
+			sysMenu.mCheckState = checkState;
+			sysMenu.mRadioCheck = radioCheck;
+			if (menuItemSelectedHandler != null)
+				sysMenu.mOnMenuItemSelected.Add(menuItemSelectedHandler);
+			if (menuItemUpdateHandler != null)
+				sysMenu.mOnMenuItemUpdate.Add(menuItemUpdateHandler);
+			sysMenu.mNativeBFMenu = null;
+			sysMenu.mParent = this;
+			sysMenu.mWindow = mWindow;
+			mChildren.Add(sysMenu);
+
+			return sysMenu;
+		}
+
+		public override void Modify(String text, String hotKey = null, SysBitmap bitmap = null, bool enabled = true, int32 checkState = -1, bool radioCheck = false)
+		{
+			if (((Object)mText != text) && (text != null))
+			{
+				if (text.Length > 0)
+				{
+					String.NewOrSet!(mText, text);
+					let bindIndex = mText.IndexOf('&');
+					if (bindIndex != -1)
+						mText.Remove(bindIndex);
+				}
+				else
+					DeleteAndNullify!(mText);
+			}
+
+			if (((Object)mHotKey != hotKey) && (hotKey != null))
+			{
+				if ((hotKey.Length > 0) && ((hotKey.Length > 1 ) || (hotKey[0] != '#')))
+				{
+					String.NewOrSet!(mHotKey, hotKey);
+					mHotKey.TrimStart('#');
+				}
+				else
+					DeleteAndNullify!(mHotKey);
+			}
+			mBitmap = bitmap;
+			mEnabled = enabled;
+			mCheckState = checkState;
+			mRadioCheck = radioCheck;
+		}
+	}
+
+	public class UISysMenuRoot : UISysMenu
+	{
+		public MenuBar mRootMenuBar;
+		public this()
+		{
+
+		}
+
+		public override SysMenu AddMenuItem(String text, String hotKey = null, MenuItemSelectedHandler menuItemSelectedHandler = null, MenuItemUpdateHandler menuItemUpdateHandler = null,
+			SysBitmap bitmap = null, bool enabled = true, int32 checkState = -1, bool radioCheck = false)
+		{
+			let item =  base.AddMenuItem(text, hotKey, menuItemSelectedHandler, menuItemUpdateHandler, bitmap, enabled, checkState, radioCheck);
+			let button = new Button();
+			button.Label = text;
+			button.mSysMenu = item;
+			button.mOnMouseClick.Add(new (evt) => {
+				mOnMenuItemSelected(this);
+				mRootMenuBar.ShowMenu(button);
+			});
+			mRootMenuBar.AddItemButton(button);
+			return item;
+		}
+	}
+
 	public class Button : ButtonWidget
 	{
 		private String mLabel ~ delete _;
@@ -29,6 +125,8 @@ public class MenuBar : Widget
 			}
 		}
 
+		public SysMenu mSysMenu;
+
 		public override void Draw(Graphics g)
 		{
 			base.Draw(g);
@@ -53,370 +151,82 @@ public class MenuBar : Widget
 		}
 	}
 
-	public Button mFileButton;
-	public Button mEditButton;
-	public Button mViewButton;
-	public Button mBuildButton;
-	public Button mDebugButton;
-	public Button mTestButton;
-	public Button mWindowButton;
-	public Button mHelpButton;
+
+	public append List<Button> mButtons = .(8);
+	public UISysMenuRoot mSysMenuRoot = new .() ~ delete _;
 
 	public this()
 	{
-		mFileButton = new Button();
-		mFileButton.Label = "File";
-		mFileButton.mOnMouseClick.Add(new (evt) => ShowFileMenu());
-		AddWidget(mFileButton);
-
-		mEditButton = new Button();
-		mEditButton.Label = "Edit";
-		mEditButton.mOnMouseClick.Add(new (evt) => ShowEditMenu());
-		AddWidget(mEditButton);
-
-		mViewButton = new Button();
-		mViewButton.Label = "View";
-		mViewButton.mOnMouseClick.Add(new (evt) => ShowViewMenu());
-		AddWidget(mViewButton);
-
-		mBuildButton = new Button();
-		mBuildButton.Label = "Build";
-		mBuildButton.mOnMouseClick.Add(new (evt) => ShowBuildMenu());
-		AddWidget(mBuildButton);
-
-		mDebugButton = new Button();
-		mDebugButton.Label = "Debug";
-		mDebugButton.mOnMouseClick.Add(new (evt) => ShowDebugMenu());
-		AddWidget(mDebugButton);
-
-		mTestButton = new Button();
-		mTestButton.Label = "Test";
-		mTestButton.mOnMouseClick.Add(new (evt) => ShowTestMenu());
-		AddWidget(mTestButton);
-
-		mWindowButton = new Button();
-		mWindowButton.Label = "Window";
-		mWindowButton.mOnMouseClick.Add(new (evt) => ShowWindowMenu());
-		AddWidget(mWindowButton);
-
-		mHelpButton = new Button();
-		mHelpButton.Label = "Help";
-		mHelpButton.mOnMouseClick.Add(new (evt) => ShowHelpMenu());
-		AddWidget(mHelpButton);
+		mSysMenuRoot.mRootMenuBar = this;
 	}
 
-	Menu AddMenuItem(Menu menu, StringView label, StringView command, bool disabled = false, bool isChecked = false)
+	public override void InitChildren()
 	{
-		let labelStr = scope String(label);
-		let hasCommand = gApp.mCommands.mCommandMap.TryGetAlt(command, var matchKey, var ideCommand);
-
-		if(hasCommand)
-		{
-			labelStr.Append("|");
-			ideCommand.ToString(labelStr);
-		}
-
-		return AddMenuItem(menu, labelStr, hasCommand ? new (evt) => ideCommand.mAction() : null, disabled, isChecked);
+		base.InitChildren();
+		mSysMenuRoot.mWindow = mWidgetWindow;
 	}
 
-	Menu AddMenuItem(Menu menu, StringView label, delegate void(Menu menu) action, bool disabled = false, bool isChecked = false)
+	public void AddItemButton(Button btn)
 	{
-		Menu item = menu.AddItem(label);
-		item.SetDisabled(disabled);
-
-		if (isChecked)
-		{
-			item.mIconImage = DarkTheme.sDarkTheme.GetImage(.Check);
-		}
-
-		if (action != null)
-		{
-			item.mOnMenuItemSelected.Add(action);
-		}
-
-		return item;
+		mButtons.Add(btn);
+		AddWidget(btn);
 	}
 
-	void ShowFileMenu()
+	public void ShowMenu(Button btn)
 	{
-		let subMenu = new Menu();
-		let newMenu = subMenu.AddItem("New");
-		AddMenuItem(newMenu, "New Workspace", "New Workspace");
-		AddMenuItem(newMenu, "New Project", "New Project");
-		AddMenuItem(newMenu, "New Debug Session", "New Debug Session");
-		AddMenuItem(newMenu, "New File", "New File");
-
-		let openMenu = subMenu.AddItem("Open");
-		AddMenuItem(openMenu, "Open Workspace...", "Open Workspace");
-		AddMenuItem(openMenu, "Open Project...", "Open Project");
-		AddMenuItem(openMenu, "Open Debug Session...", "Open Debug Session");
-		AddMenuItem(openMenu, "Open File...", "Open File");
-		AddMenuItem(openMenu, "Open File in Workspace", "Open File in Workspace");
-		AddMenuItem(openMenu, "Open Corresponding (cpp/h)", "Open Corresponding");
-		AddMenuItem(openMenu, "Open Crash Dump...", "Open Crash Dump");
-
-		let recentMenu = subMenu.AddItem("Open Recent");
-		PopulateRecentMenu(.OpenedWorkspace, recentMenu.AddItem("Open Recent Workspace"));
-		PopulateRecentMenu(.OpenedDebugSession, recentMenu.AddItem("Open Recent Debug Session"));
-		PopulateRecentMenu(.OpenedFile, recentMenu.AddItem("Open Recent File"));
-		PopulateRecentMenu(.OpenedCrashDump, recentMenu.AddItem("Open Recent Crash Dump"));
-			  
-		AddMenuItem(subMenu, "Save File", "Save File", gApp.GetActiveDocumentPanel() == null);
-		AddMenuItem(subMenu, "Save As...", "Save As", gApp.GetActiveDocumentPanel() == null);
-		AddMenuItem(subMenu, "Save All", "Save All");
-		let prefMenu = subMenu.AddItem("Preferences");
-		AddMenuItem(prefMenu, "Settings", "Settings");
-		AddMenuItem(prefMenu, "Reload Settings", "Reload Settings");
-		AddMenuItem(prefMenu, "Reset UI", "Reset UI");
-		AddMenuItem(prefMenu, "Safe Mode", "Safe Mode Toggle", false, gApp.mSafeMode);
-		AddMenuItem(subMenu, "Close Workspace", "Close Workspace", !gApp.mWorkspace.IsInitialized);
-		AddMenuItem(subMenu, "Exit", "Exit");
-
-		let menuWidget = DarkTheme.sDarkTheme.CreateMenuWidget(subMenu);
-		menuWidget.Init(mFileButton, 0, mHeight);
+		if (btn.mSysMenu.mChildren == null)
+			return;
+
+		let menu = new Menu();
+		btn.mSysMenu.mOnMenuItemUpdate(btn.mSysMenu);
+		PopulateMenu(menu, btn.mSysMenu);
+		let menuWidget = DarkTheme.sDarkTheme.CreateMenuWidget(menu);
+		menuWidget.Init(btn, 0, mHeight);
 	}
 
-	void PopulateRecentMenu(RecentFiles.RecentKind kind, Menu menu)
+	void PopulateMenu(Menu parentMenu, SysMenu sysMenu)
 	{
-		let recents = gApp.mSettings.mRecentFiles.GetRecentList(kind);
-		let itemCount = Math.Min(recents.Count, 10);
-
-		menu.SetDisabled(itemCount < 1);
-		
-		for(int i = 0; i < itemCount; i++)
-		{
-			AddMenuItem(menu, scope $"{i+1} {recents[i]}", new (evt) =>
-				{
-					gApp.[Friend]ShowRecentFile(kind, i);
-				});
-		}
-	}
+		if (sysMenu.mChildren == null)
+			return;
 
-	void ShowEditMenu()
-	{
-		let subMenu = new Menu();
-		AddMenuItem(subMenu, "Quick Find...", "Find in Document", gApp.GetActivePanel() == null);
-		AddMenuItem(subMenu, "Quick Replace...", "Replace in Document", gApp.GetActiveDocumentPanel() == null);
-		AddMenuItem(subMenu, "Find in Files...", "Find in Files");
-		AddMenuItem(subMenu, "Replace in Files...", "Replace in Files");
-		AddMenuItem(subMenu, "Find Prev", "Find Prev", gApp.GetActivePanel() == null);
-		AddMenuItem(subMenu, "Find Next", "Find Next", gApp.GetActivePanel() == null);
-		AddMenuItem(subMenu, "Show Current", "Show Current");
-
-		AddMenuItem(subMenu, "Goto Line...", "Goto Line", gApp.GetActiveDocumentPanel() == null);
-		AddMenuItem(subMenu, "Goto Method...", "Goto Method", gApp.GetActiveDocumentPanel() == null);
-		AddMenuItem(subMenu, "Rename Symbol", "Rename Symbol", gApp.GetActiveDocumentPanel() == null);
-		AddMenuItem(subMenu, "Show Fixit", "Show Fixit", gApp.GetActiveDocumentPanel() == null);
-		AddMenuItem(subMenu, "Find All References", "Find All References", gApp.GetActiveDocumentPanel() == null);
-		AddMenuItem(subMenu, "Find Class...", "Find Class");
-		subMenu.AddItem(null);
-		var encodingMenu = subMenu.AddItem("Encoding");
-		var lineEndingMenu = encodingMenu.AddItem("Line Ending");
-		void AddLineEndingKind(String name, LineEndingKind lineEndingKind)
+		String buffer = scope .();
+		for (let item in sysMenu.mChildren)
 		{
-			let item = lineEndingMenu.AddItem(name);
-			let sourceViewPanel = gApp.GetActiveSourceViewPanel(true);
-
-			if (sourceViewPanel != null)
+			if (item.mText == null)
 			{
-				if (sourceViewPanel.mEditData.mLineEndingKind == lineEndingKind)
-				{
-					item.mIconImage = DarkTheme.sDarkTheme.GetImage(.Check);
-				}
-				item.mOnMenuItemSelected.Add(new (evt) => 
-				{
-					if (sourceViewPanel.mEditData.mLineEndingKind != lineEndingKind)
-					{
-						sourceViewPanel.EditWidget.Content.mData.mCurTextVersionId++;
-						sourceViewPanel.mEditData.mLineEndingKind = lineEndingKind;
-					}
-				});
+				parentMenu.AddItem(null);
+				continue;
 			}
-		}
-		AddLineEndingKind("Windows", .CrLf);
-		AddLineEndingKind("Unix", .Lf);
-		AddLineEndingKind("Mac OS 9", .Cr);
-
-		var bookmarkMenu = subMenu.AddItem("Bookmarks");
-		AddMenuItem(bookmarkMenu, "Toggle Bookmark", "Bookmark Toggle");
-		AddMenuItem(bookmarkMenu, "Next Bookmark", "Bookmark Next");
-		AddMenuItem(bookmarkMenu, "Previous Bookmark", "Bookmark Prev");
-		AddMenuItem(bookmarkMenu, "Clear Bookmarks", "Bookmark Clear");
-
-		var comptimeMenu = subMenu.AddItem("Comptime");
-		var emitViewCompiler = comptimeMenu.AddItem("Emit View Compiler");
-		AddMenuItem(emitViewCompiler, "Resolve", new (evt) => gApp.SetEmbedCompiler(.Resolve), false, gApp.mSettings.mEditorSettings.mEmitCompiler == .Resolve);
-		AddMenuItem(emitViewCompiler, "Build", new (evt) => gApp.SetEmbedCompiler(.Build), false, gApp.mSettings.mEditorSettings.mEmitCompiler == .Build);
-
-		var advancedEditMenu = subMenu.AddItem("Advanced");
-		AddMenuItem(advancedEditMenu, "Duplicate Line", "Duplicate Line");
-		AddMenuItem(advancedEditMenu, "Move Line Up", "Move Line Up");
-		AddMenuItem(advancedEditMenu, "Move Line Down", "Move Line Down");
-		AddMenuItem(advancedEditMenu, "Move Statement Up", "Move Statement Up");
-		AddMenuItem(advancedEditMenu, "Move Statement Down", "Move Statement Down");
-		advancedEditMenu.AddItem(null);
-		AddMenuItem(advancedEditMenu, "Make Uppercase", "Make Uppercase");
-		AddMenuItem(advancedEditMenu, "Make Lowercase", "Make Lowercase");
-		AddMenuItem(advancedEditMenu, "Comment Block", "Comment Block");
-		AddMenuItem(advancedEditMenu, "Comment Lines", "Comment Lines");
-		AddMenuItem(advancedEditMenu, "Comment Toggle", "Comment Toggle");
-		AddMenuItem(advancedEditMenu, "Uncomment Selection", "Uncomment Selection");
-		AddMenuItem(advancedEditMenu, "Reformat Document", "Reformat Document");
-		AddMenuItem(advancedEditMenu, "View White Space", "View White Space", false, gApp.mViewWhiteSpace.Bool);
-
-		if (gApp.mSettings.mEnableDevMode)
-		{
-			subMenu.AddItem(null);
-			var internalEditMenu = subMenu.AddItem("Internal");
-			AddMenuItem(internalEditMenu, "Hilight Cursor References", new (menu) => { gApp.mSettings.mEditorSettings.mHiliteCursorReferences = !gApp.mSettings.mEditorSettings.mHiliteCursorReferences; }, false, gApp.mSettings.mEditorSettings.mHiliteCursorReferences);
-			AddMenuItem(internalEditMenu, "Delayed Autocomplete", new (menu) => { gApp.mDbgDelayedAutocomplete = !gApp.mDbgDelayedAutocomplete; }, false, gApp.mDbgDelayedAutocomplete);
-			AddMenuItem(internalEditMenu, "Time Autocomplete",  new (menu) => { gApp.mDbgTimeAutocomplete = !gApp.mDbgTimeAutocomplete; }, false, gApp.mDbgTimeAutocomplete);
-			AddMenuItem(internalEditMenu, "Perf Autocomplete", new (menu) => { gApp.mDbgPerfAutocomplete = !gApp.mDbgPerfAutocomplete; }, false, gApp.mDbgPerfAutocomplete);
-			AddMenuItem(internalEditMenu, "Dump Undo Buffer", new (menu) =>
+
+			StringView displayText = item.mText;
+			if (!String.IsNullOrEmpty(item.mHotKey))
 			{
-				if (var panel = gApp.GetActiveSourceViewPanel())
-				{
-					var str = panel.mEditWidget.mEditWidgetContent.mData.mUndoManager.ToString(.. scope .());
-					Debug.WriteLine(str);
-				}
-			}, false, gApp.mDbgPerfAutocomplete);
-		}
+				buffer..Clear().AppendF($"{item.mText}|{item.mHotKey}");
+				displayText = buffer;
+			}
 
-		let menuWidget = DarkTheme.sDarkTheme.CreateMenuWidget(subMenu);
-		menuWidget.Init(mEditButton, 0, mHeight);
+			item.mOnMenuItemUpdate(item);
+			let menu = AddMenuItem(parentMenu, displayText, new (menu) => item.mOnMenuItemSelected(menu), !item.mEnabled, item.mCheckState > 0, item.mRadioCheck);
+			PopulateMenu(menu, item);
+		}
 	}
 
-	void ShowViewMenu()
+	Menu AddMenuItem(Menu menu, StringView label, delegate void(Menu menu) action, bool disabled = false, bool isChecked = false, bool radio = false)
 	{
-		let subMenu = new Menu();
-		AddMenuItem(subMenu, "AutoComplete", "Show Autocomplete Panel");
-		AddMenuItem(subMenu, "Auto Watches", "Show Auto Watches");
-		AddMenuItem(subMenu, "Bookmarks", "Show Bookmarks");
-		AddMenuItem(subMenu, "Breakpoints", "Show Breakpoints");
-		AddMenuItem(subMenu, "Call Stack", "Show Call Stack");
-		AddMenuItem(subMenu, "Class View", "Show Class View");
-		AddMenuItem(subMenu, "Diagnostics", "Show Diagnostics");
-		AddMenuItem(subMenu, "Errors", "Show Errors");
-		AddMenuItem(subMenu, "Find Results", "Show Find Results");
-		AddMenuItem(subMenu, "Terminal", "Show Terminal");
-		AddMenuItem(subMenu, "Console", "Show Console");
-		AddMenuItem(subMenu, "Immediate Window", "Show Immediate");
-		AddMenuItem(subMenu, "Memory", "Show Memory");
-		AddMenuItem(subMenu, "Modules", "Show Modules");
-		AddMenuItem(subMenu, "Output", "Show Output");
-		AddMenuItem(subMenu, "Profiler", "Show Profiler");
-		AddMenuItem(subMenu, "Threads", "Show Threads");
-		AddMenuItem(subMenu, "Watches", "Show Watches");
-		AddMenuItem(subMenu, "Workspace Explorer", "Show Workspace Explorer");
-		subMenu.AddItem(null);
-		AddMenuItem(subMenu, "Next Document Panel", "Next Document Panel");
-		AddMenuItem(subMenu, "Navigate Backwards", "Navigate Backwards");
-		AddMenuItem(subMenu, "Navigate Forwards", "Navigate Forwards");
-
-		let menuWidget = DarkTheme.sDarkTheme.CreateMenuWidget(subMenu);
-		menuWidget.Init(mViewButton, 0, mHeight);
-	}
+		Menu item = menu.AddItem(label);
+		item.SetDisabled(disabled);
 
-	void ShowBuildMenu()
-	{
-		let subMenu = new Menu();
-		AddMenuItem(subMenu, "Build Workspace", "Build Workspace", !gApp.mWorkspace.IsInitialized);
-		AddMenuItem(subMenu, "Debug Comptime", "Debug Comptime", gApp.mDebugger.mIsRunning || !gApp.mWorkspace.IsInitialized);
-		AddMenuItem(subMenu, "Clean", "Clean", gApp.mDebugger.mIsRunning || !gApp.mWorkspace.IsInitialized);
-		AddMenuItem(subMenu, "Clean Beef", "Clean Beef", gApp.mDebugger.mIsRunning || !gApp.mWorkspace.IsInitialized);
-		AddMenuItem(subMenu, "Compile Current File", new (menu) => { gApp.[Friend]CompileCurrentFile(); });
-		AddMenuItem(subMenu, "Cancel Build", "Cancel Build", !gApp.IsCompiling);
-		AddMenuItem(subMenu, "Verbose", new (menu) =>
-		{
-			if (gApp.mVerbosity != .Diagnostic)
-				gApp.mVerbosity = .Diagnostic;
-			else
-				gApp.mVerbosity = .Normal;
-		}, false, (gApp.mVerbosity == .Diagnostic));
-		
-		if (gApp.mSettings.mEnableDevMode)
+		if (isChecked)
 		{
-			var internalBuildMenu = subMenu.AddItem("Internal");
-			AddMenuItem(internalBuildMenu, "Autobuild (Debug)", new (menu) => { gApp.mDebugAutoBuild = !gApp.mDebugAutoBuild; });
-			AddMenuItem(internalBuildMenu, "Autorun (Debug)", new (menu) => { gApp.mDebugAutoRun = !gApp.mDebugAutoRun; });
-			AddMenuItem(internalBuildMenu, "Disable Compiling", new (menu) => { gApp.mDisableBuilding = !gApp.mDisableBuilding; }, false, gApp.mDisableBuilding);
+			item.mIconImage = DarkTheme.sDarkTheme.GetImage((radio ? .RadioOff : .Check));
 		}
 
-		let menuWidget = DarkTheme.sDarkTheme.CreateMenuWidget(subMenu);
-		menuWidget.Init(mBuildButton, 0, mHeight);		
-	}
-
-	void ShowDebugMenu()
-	{
-		let subMenu = new Menu();
-		AddMenuItem(subMenu, "Start Debugging", "Start Debugging", true); // TODO: Debugging status
-		AddMenuItem(subMenu, "Start Without Debugging", "Start Without Debugging", gApp.mDebugger.mIsRunning || !gApp.mWorkspace.IsInitialized);
-		AddMenuItem(subMenu, "Start Without Compiling", "Start Without Compiling", gApp.mDebugger.mIsRunning || !gApp.mWorkspace.IsInitialized);
-		AddMenuItem(subMenu, "Launch Process...", "Launch Process", gApp.mDebugger.mIsRunning);
-		AddMenuItem(subMenu, "Attach to Process...", "Attach to Process", gApp.mDebugger.mIsRunning);
-		AddMenuItem(subMenu, "Stop Debugging", "Stop Debugging", !gApp.mDebugger.mIsRunning && (gApp.mTestManager == null));
-		AddMenuItem(subMenu, "Break All", "Break All", !gApp.mDebugger.mIsRunning || gApp.mExecutionPaused);
-		AddMenuItem(subMenu, "Remove All Breakpoints", "Remove All Breakpoints");
-		AddMenuItem(subMenu, "Show Disassembly", "Show Disassembly");
-		AddMenuItem(subMenu, "Quick Watch", "Show QuickWatch", !gApp.mDebugger.mIsRunning || !gApp.mExecutionPaused);
-		AddMenuItem(subMenu, "Profile", "Profile", !gApp.mWorkspace.IsInitialized);
-		subMenu.AddItem(null);
-		AddMenuItem(subMenu, "Step Into", "Step Into", (gApp.mDebugger.mIsRunning && !gApp.mExecutionPaused) || !gApp.mWorkspace.IsInitialized);
-		AddMenuItem(subMenu, "Step Over", "Step Over", (gApp.mDebugger.mIsRunning && !gApp.mExecutionPaused) || !gApp.mWorkspace.IsInitialized);
-		AddMenuItem(subMenu, "Step Out", "Step Out", !gApp.mDebugger.mIsRunning || !gApp.mExecutionPaused);
-		subMenu.AddItem(null);
-		AddMenuItem(subMenu, "Toggle Breakpoint", "Breakpoint Toggle", gApp.GetActiveDocumentPanel() == null);
-		AddMenuItem(subMenu, "Toggle Thread Breakpoint", "Breakpoint Toggle Thread", gApp.GetActiveDocumentPanel() == null);
-		var newBreakpointMenu = subMenu.AddItem("New Breakpoint");
-		AddMenuItem(newBreakpointMenu, "Memory Breakpoint...", "Breakpoint Memory", !gApp.mDebugger.mIsRunning);
-		AddMenuItem(newBreakpointMenu, "Symbol Breakpoint...", "Breakpoint Symbol");
-		//TODO: dev mode
-
-		let menuWidget = DarkTheme.sDarkTheme.CreateMenuWidget(subMenu);
-		menuWidget.Init(mDebugButton, 0, mHeight);				
-	}
-
-	void ShowTestMenu()
-	{
-		let testMenu = new Menu();
-		var testRunMenu = testMenu.AddItem("Run");
-		testRunMenu.SetDisabled(!gApp.mWorkspace.IsInitialized);
-		AddMenuItem(testRunMenu, "Normal Tests", "Run Normal Tests");
-		AddMenuItem(testRunMenu, "All Tests", "Run All Tests");
-
-		var testDebugMenu = testMenu.AddItem("Debug");
-		testDebugMenu.SetDisabled(!gApp.mWorkspace.IsInitialized);
-		AddMenuItem(testDebugMenu, "Normal Tests", "Debug Normal Tests");
-		AddMenuItem(testDebugMenu, "All Tests", "Debug All Tests");
-		testDebugMenu.AddItem(null);
-		AddMenuItem(testDebugMenu, "Break on Failure", new (evt) => { gApp.mTestBreakOnFailure = !gApp.mTestBreakOnFailure; }, false, gApp.mTestBreakOnFailure);
-		AddMenuItem(testMenu, "Enable Console", "Test Enable Console", false, gApp.mTestEnableConsole);
-
-		let menuWidget = DarkTheme.sDarkTheme.CreateMenuWidget(testMenu);
-		menuWidget.Init(mTestButton, 0, mHeight);		
-	}
-
-	void ShowWindowMenu()
-	{
-		let windowMenu = new Menu();
-		AddMenuItem(windowMenu, "Close Document", "Close Document", gApp.GetLastActiveDocumentPanel() == null);
-		AddMenuItem(windowMenu, "Close Panel", "Close Panel", gApp.GetActivePanel() == null);
-		AddMenuItem(windowMenu, "Close All", "Close All Panels");
-		AddMenuItem(windowMenu, "Close All Except Current", "Close All Panels Except");
-		AddMenuItem(windowMenu, "New View into File", "View New", gApp.GetActiveDocumentPanel() == null);
-		AddMenuItem(windowMenu, "Split View", "View Split", gApp.GetActiveDocumentPanel() == null);
-
-		let menuWidget = DarkTheme.sDarkTheme.CreateMenuWidget(windowMenu);
-		menuWidget.Init(mWindowButton, 0, mHeight);	
-	}
-
-	void ShowHelpMenu()
-	{
-		let subMenu = new Menu();
-		AddMenuItem(subMenu, "About", "About");
+		if (action != null)
+		{
+			item.mOnMenuItemSelected.Add(action);
+		}
 
-		let menuWidget = DarkTheme.sDarkTheme.CreateMenuWidget(subMenu);
-		menuWidget.Init(mHelpButton, 0, mHeight);		
+		return item;
 	}
 
 	void ResizeComponents()
@@ -425,22 +235,12 @@ public class MenuBar : Widget
 		let padding = GS!(20);
 		float offset = 0;
 
-
-		void ResizeButton(Button button)
+		for (let btn in mButtons)
 		{
-			let width = font.GetWidth(button.Label) + padding;
-			button.Resize(offset, 0, width, mHeight);
+			let width = font.GetWidth(btn.Label) + padding;
+			btn.Resize(offset, 0, width, mHeight);
 			offset += width;
 		}
-
-		ResizeButton(mFileButton);
-		ResizeButton(mEditButton);
-		ResizeButton(mViewButton);
-		ResizeButton(mBuildButton);
-		ResizeButton(mDebugButton);
-		ResizeButton(mTestButton);
-		ResizeButton(mWindowButton);
-		ResizeButton(mHelpButton);
 	}
 
 	public override void Resize(float x, float y, float width, float height)
@@ -456,4 +256,4 @@ public class MenuBar : Widget
 			g.FillRect(0, 0, mWidth, mHeight);
 		}
 	}
-}
\ No newline at end of file
+}