diff --git a/src/App.vue b/src/App.vue
index a092750..7886738 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="flex flex-col h-screen text-system-text text-sm">
     <nav-bar v-if="isMacOS" class="flex-none"></nav-bar>
+    <command-bar v-if="isWindows" class="flex-none"></command-bar>
     <div class="flex-1 flex flex-row items-stretch">
       <sidebar class="flex-none border-r border-system-divider"></sidebar>
       <preview></preview>
@@ -15,7 +16,8 @@ import Preview from './components/Preview.vue';
 import Sidebar from './components/Sidebar.vue';
 import Controls from './components/Controls.vue';
 import NavBar from './components/NavBar.vue';
-import { useIsMacOS } from './integration/platform';
+import CommandBar from './components/CommandBar.vue';
+import { useIsMacOS, useIsWindows } from './integration/platform';
 
 export default defineComponent({
   name: 'App',
@@ -24,10 +26,12 @@ export default defineComponent({
     Sidebar,
     Controls,
     NavBar,
+    CommandBar,
   },
   setup() {
     return {
-      isMacOS: useIsMacOS()
+      isMacOS: useIsMacOS(),
+      isWindows: useIsWindows()
     }
   }
 });
diff --git a/src/background.ts b/src/background.ts
index 5837586..213ceb5 100644
--- a/src/background.ts
+++ b/src/background.ts
@@ -5,7 +5,7 @@ import { createProtocol } from 'vue-cli-plugin-electron-builder/lib'
 import installExtension, { VUEJS3_DEVTOOLS } from 'electron-devtools-installer'
 import { basename } from 'path';
 
-import { installContextMenuHandling, configureApplicationMenu } from './electron/menus';
+import { installContextMenuHandling, configureApplicationMenu, showsApplicationMenu } from './electron/menus';
 import emitter from './electron/events';
 import { openPreferences } from './electron/preferences-window';
 import { injectSystemColors } from './electron/colors';
@@ -51,7 +51,8 @@ async function createWindow() {
     minWidth: 1050,
     show: false,
     vibrancy: 'sidebar',
-    titleBarStyle: process.platform === 'darwin' ? 'hiddenInset' : 'default',
+    titleBarStyle: process.platform === 'darwin' ? 'hiddenInset' : 'hidden',
+    titleBarOverlay: process.platform === 'win32',
     webPreferences: {
       
       // Use pluginOptions.nodeIntegration, leave this alone
@@ -70,6 +71,15 @@ async function createWindow() {
     win.show();
   });
 
+  if (!showsApplicationMenu() && isDevelopment) {
+    win.webContents.on('before-input-event', (event, input) => {
+      if (input.control && input.shift && input.key.toLocaleLowerCase() == 'i') {
+        win.webContents.openDevTools({ mode: 'undocked' });
+        event.preventDefault();
+      }
+    })
+  }
+
   if (process.env.WEBPACK_DEV_SERVER_URL) {
     // Load the url of the dev server if in development mode
     await win.loadURL(process.env.WEBPACK_DEV_SERVER_URL as string)
diff --git a/src/components/CommandBar.vue b/src/components/CommandBar.vue
new file mode 100644
index 0000000..24bee9f
--- /dev/null
+++ b/src/components/CommandBar.vue
@@ -0,0 +1,59 @@
+<template>
+  <div>
+    <div class="app-region-drag bg-system-background-nav-bar p-2 flex items-baseline space-x-2" style="height: env(titlebar-area-height, 40px); width: env(titlebar-area-width, 0px);">
+      <ConnectionState size="small"></ConnectionState>
+      
+      <span>obs-layout</span>
+    </div>
+    <div class="bg-system-background-nav-bar flex items-center justify-end">
+      <Popover class="relative">
+        <PopoverButton class="flex items-center hover:bg-gray-300 p-3 space-x-1">
+          <CloudUploadIcon class="w-6 h-6 text-gray-600" />
+
+          <span>Sync</span>
+        </PopoverButton>
+
+        <PopoverPanel class="absolute z-10 right-0">
+          <sync-popover></sync-popover>
+        </PopoverPanel>
+      </Popover>
+
+      <button class="flex space-x-1 hover:bg-gray-300 p-3" @click="openSettings">
+        <CogIcon class="w-6 h-6 text-gray-600" />
+
+        <span>Settings</span>
+      </button>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue'
+import { CloudUploadIcon, CogIcon } from '@heroicons/vue/outline';
+import { Popover, PopoverButton, PopoverPanel } from '@headlessui/vue'
+import ConnectionState from './ConnectionState.vue';
+import { ipcRenderer } from 'electron';
+import SyncPopover from './SyncPopover.vue';
+
+export default defineComponent({
+  components: {
+    CloudUploadIcon,
+    CogIcon,
+    ConnectionState,
+    SyncPopover,
+
+    Popover,
+    PopoverButton,
+    PopoverPanel
+  },  
+  setup() {
+    const openSettings = () => {
+      ipcRenderer.send('open-settings');
+    }
+
+    return {
+      openSettings
+    }
+  },
+})
+</script>
diff --git a/src/components/ConnectionState.vue b/src/components/ConnectionState.vue
new file mode 100644
index 0000000..acbc249
--- /dev/null
+++ b/src/components/ConnectionState.vue
@@ -0,0 +1,72 @@
+<template>
+  <div :class="`${backgroundColor} ${sizeClasses} rounded-full`" :title="title"></div>
+</template>
+
+<script lang="ts">
+import { defineComponent, computed, PropType, toRefs } from 'vue'
+import { useStore } from '@/store/app'
+import { OBSConnectionState } from '@/obs/connection-state';
+
+enum Size {
+  Small = 'small',
+  Medium = 'medium'
+}
+
+export default defineComponent({
+  props: {
+    size: {
+      type: String as PropType<Size>,
+      required: true
+    }
+  },
+  setup(props) {
+    const store = useStore()
+
+    const { size } = toRefs(props);
+
+    const sizeClasses = computed(() => {
+      switch (size.value) {
+        case Size.Small:
+          return 'w-2 h-2'
+        case Size.Medium:
+          return 'w-4 h-4'
+        default:
+          return ''
+      }
+    })
+
+    // eslint-disable-next-line vue/return-in-computed-property
+    const backgroundColor = computed(() => {
+      switch (store.state.connectionState) {
+        case OBSConnectionState.Connecting:
+          return 'bg-yellow-500'
+        case OBSConnectionState.Connected:
+          return 'bg-green-500'
+        case OBSConnectionState.Disconnected:
+        case OBSConnectionState.Error:
+          return 'bg-red-500'
+      }
+    })
+
+    // eslint-disable-next-line vue/return-in-computed-property
+    const title = computed(() => {
+      switch (store.state.connectionState) {
+        case OBSConnectionState.Disconnected:
+          return 'Disconnected'
+        case OBSConnectionState.Connecting:
+          return 'Connecting'
+        case OBSConnectionState.Connected:
+          return 'Connected'
+        case OBSConnectionState.Error:
+          return 'Error'
+      }
+    })
+
+    return {
+      backgroundColor,
+      title,
+      sizeClasses
+    }
+  },
+})
+</script>
diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index 5f532dd..c3c7816 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -12,33 +12,20 @@
         </div>
 
         <PopoverPanel class="absolute z-10">
-          <div class="w-64 p-2 space-y-2 shadow-lg bg-system-background-window">
-            <div>Sync current layout to scene:</div>
-            
-            <div>
-              <select class="w-full text-system-text-control bg-system-background-control" v-model="scene">
-                <option v-for="scene in scenes" :key="scene" :value="scene" v-text="scene"></option>
-              </select>
-            </div>
-
-            <div class="flex justify-end">
-              <button class="px-3 py-1 bg-green-500" @click="sync">Sync</button>
-            </div>
-          </div>
+          <sync-popover></sync-popover>
         </PopoverPanel>
       </Popover>
-      <div class="w-4 h-4 rounded-full" :class="connectionStateBackgroundColor" :title="connectionStateText"></div>
+      <ConnectionState size="medium"></ConnectionState>
     </div>
   </div>
 </template>
 
 <script lang="ts">
-import { OBSConnectionState } from '@/obs/connection-state'
-import { useStore } from '@/store/app'
-import { computed, defineComponent, ref } from 'vue'
+import { defineComponent } from 'vue'
 import { CloudUploadIcon, ChevronDownIcon } from '@heroicons/vue/outline';
-import { Popover, PopoverButton, PopoverPanel } from '@headlessui/vue';
-import { syncLayout } from '@/integration/obs';
+import { Popover, PopoverButton, PopoverPanel } from '@headlessui/vue'
+import ConnectionState from './ConnectionState.vue';
+import SyncPopover from './SyncPopover.vue';
 
 export default defineComponent({
   components: {
@@ -47,53 +34,10 @@ export default defineComponent({
 
     Popover,
     PopoverButton,
-    PopoverPanel
-  },
-  setup() {
-    const store = useStore()
-
-    // eslint-disable-next-line vue/return-in-computed-property
-    const connectionStateBackgroundColor = computed(() => {
-      switch (store.state.connectionState) {
-        case OBSConnectionState.Connecting:
-          return 'bg-yellow-500'
-        case OBSConnectionState.Connected:
-          return 'bg-green-500'
-        case OBSConnectionState.Disconnected:
-        case OBSConnectionState.Error:
-          return 'bg-red-500'
-      }
-    })
-
-    // eslint-disable-next-line vue/return-in-computed-property
-    const connectionStateText = computed(() => {
-      switch (store.state.connectionState) {
-        case OBSConnectionState.Disconnected:
-          return 'Disconnected'
-        case OBSConnectionState.Connecting:
-          return 'Connecting'
-        case OBSConnectionState.Connected:
-          return 'Connected'
-        case OBSConnectionState.Error:
-          return 'Error'
-      }
-    })
-
-    const scene = ref('');
-    const scenes = computed(() => store.state.scenes);
-
-    const sync = () => {
-      if (!store.state.rootNode) { return }
-      syncLayout(store.state.rootNode, scene.value);
-    }
+    PopoverPanel,
 
-    return {
-      connectionStateBackgroundColor,
-      connectionStateText,
-      scenes,
-      scene,
-      sync
-    }
+    ConnectionState,
+    SyncPopover
   },
 })
 </script>
diff --git a/src/components/SyncPopover.vue b/src/components/SyncPopover.vue
new file mode 100644
index 0000000..258771b
--- /dev/null
+++ b/src/components/SyncPopover.vue
@@ -0,0 +1,41 @@
+<template>
+  <div class="w-64 p-2 space-y-2 shadow-lg bg-system-background-window">
+    <div>Sync current layout to scene:</div>
+    
+    <div>
+      <select class="w-full text-system-text-control bg-system-background-control" v-model="scene">
+        <option v-for="scene in scenes" :key="scene" :value="scene" v-text="scene"></option>
+      </select>
+    </div>
+
+    <div class="flex justify-end">
+      <button class="px-3 py-1 bg-green-500" @click="sync">Sync</button>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent, ref, computed } from 'vue'
+import { useStore } from '@/store/app'
+import { syncLayout } from '@/integration/obs'
+
+export default defineComponent({
+  setup() {
+    const store = useStore();
+
+    const scene = ref('');
+    const scenes = computed(() => store.state.scenes);
+
+    const sync = () => {
+      if (!store.state.rootNode) { return }
+      syncLayout(store.state.rootNode, scene.value);
+    }
+
+    return {
+      scene,
+      scenes,
+      sync
+    }
+  },
+})
+</script>
diff --git a/src/electron/colors.ts b/src/electron/colors.ts
index c8f19ea..704d4b9 100644
--- a/src/electron/colors.ts
+++ b/src/electron/colors.ts
@@ -25,6 +25,10 @@ type ColorModeMapping = {
   dark: ColorMapping
 }
 
+function getAccentColor(): string {
+  return '#' + systemPreferences.getAccentColor();
+}
+
 function deriveColorMapping(): ColorModeMapping {
   if (process.platform == 'darwin') {
     return {
@@ -39,7 +43,7 @@ function deriveColorMapping(): ColorModeMapping {
         selectedContentBackground: systemPreferences.getColor('selected-content-background'),
         windowBackground: systemPreferences.getColor('window-background'),
       
-        accent: systemPreferences.getAccentColor(),
+        accent: getAccentColor(),
         separator: /*systemPreferences.getColor('separator')*/ '#ffffff1a',
         divider: '#000000'
       },
@@ -54,7 +58,7 @@ function deriveColorMapping(): ColorModeMapping {
         selectedContentBackground: systemPreferences.getColor('selected-content-background'),
         windowBackground: systemPreferences.getColor('window-background'),
       
-        accent: systemPreferences.getAccentColor(),
+        accent: getAccentColor(),
         separator: /*systemPreferences.getColor('separator')*/ '#d8d4d8',
         divider: '#d8d4d8'
       }
@@ -64,15 +68,15 @@ function deriveColorMapping(): ColorModeMapping {
       dark: {
         text: systemPreferences.getColor('window-text'),
         textSecondary: systemPreferences.getColor('window-text'),
-        controlText: systemPreferences.getColor('window-text'),
+        controlText: systemPreferences.getColor('button-text'),
         selectedControlText: systemPreferences.getColor('window-text'),
 
         controlBackground: '',
-        navBarBackground: '#3c363c',
-        selectedContentBackground: systemPreferences.getAccentColor(),
+        navBarBackground: '#f0f0f0',
+        selectedContentBackground: getAccentColor(),
         windowBackground: systemPreferences.getColor('window'),
       
-        accent: systemPreferences.getAccentColor(),
+        accent: getAccentColor(),
         separator: '',
         divider: '#000000'
       },
@@ -83,11 +87,11 @@ function deriveColorMapping(): ColorModeMapping {
         selectedControlText: systemPreferences.getColor('window-text'),
         
         controlBackground: '',
-        navBarBackground: '#efebef',
-        selectedContentBackground: systemPreferences.getAccentColor(),
+        navBarBackground: '#f0f0f0',
+        selectedContentBackground: getAccentColor(),
         windowBackground: systemPreferences.getColor('window'),
       
-        accent: systemPreferences.getAccentColor(),
+        accent: getAccentColor(),
         separator: '',
         divider: '#d8d4d8'
       }
diff --git a/src/electron/interface.ts b/src/electron/interface.ts
index 3d0135e..1f43952 100644
--- a/src/electron/interface.ts
+++ b/src/electron/interface.ts
@@ -3,6 +3,7 @@ import { ipcMain } from "electron";
 import OBSSocket from "@/electron/obs";
 import Preferences from "./preferences";
 import { Node } from './obs';
+import emitter from './events';
 
 export interface InstallationOptions {
   preferences: Preferences,
@@ -49,4 +50,8 @@ export function install(options: InstallationOptions): void {
   ipcMain.handle('sync-layout-to-scene', (_, nodes: Node[], sceneName: string) => {
     return options.obsSocket.syncLayout(nodes, sceneName);
   })
+
+  ipcMain.on('open-settings', () => {
+    emitter.emit('open-preferences');
+  })
 }
\ No newline at end of file
diff --git a/src/electron/menus.ts b/src/electron/menus.ts
index c4d39b6..5ec91b3 100644
--- a/src/electron/menus.ts
+++ b/src/electron/menus.ts
@@ -31,40 +31,49 @@ export function installContextMenuHandling(): void {
   });
 }
 
+export function showsApplicationMenu(): boolean {
+  return process.platform == 'darwin'
+}
+
 export function configureApplicationMenu(): void {
-  Menu.setApplicationMenu(
-    Menu.buildFromTemplate(
-      [
-        {
-          role: 'appMenu',
-          submenu: [
-            { role: 'about' },
-            { type: 'separator' },
-            {
-              label: 'Preferences...',
-              accelerator: 'CmdOrCtrl+,',
-              click: () => { emitter.emit('open-preferences') }
-            },
-            { type: 'separator' },
-            { role: 'services' },
-            { type: 'separator' },
-            { role: 'hide' },
-            { role: 'hideOthers' },
-            { role: 'unhide' },
-            { type: 'separator'},
-            { role: 'quit' }
-          ]
-        },
-        {
-          role: 'windowMenu',
-          submenu: [
-            { role: 'minimize' },
-            { role: 'zoom' },
-            { type: 'separator' },
-            { role: 'toggleDevTools' }
-          ]
-        }
-      ]
+  if (showsApplicationMenu()) {
+    Menu.setApplicationMenu(
+      Menu.buildFromTemplate(
+        [
+          {
+            role: 'appMenu',
+            submenu: [
+              { role: 'about' },
+              { type: 'separator' },
+              {
+                label: 'Preferences...',
+                accelerator: 'CmdOrCtrl+,',
+                click: () => { emitter.emit('open-preferences') }
+              },
+              { type: 'separator' },
+              { role: 'services' },
+              { type: 'separator' },
+              { role: 'hide' },
+              { role: 'hideOthers' },
+              { role: 'unhide' },
+              { type: 'separator'},
+              { role: 'quit' }
+            ]
+          },
+          {
+            role: 'windowMenu',
+            submenu: [
+              { role: 'minimize' },
+              { role: 'zoom' },
+              { type: 'separator' },
+              { role: 'toggleDevTools' }
+            ]
+          }
+        ]
+      )
     )
-  )
+  } else {
+    // Remove the menu on Windows, since we'll use the command bar for similar purposes.
+    Menu.setApplicationMenu(null)
+  }
 }
\ No newline at end of file