diff --git a/darwin/default.nix b/darwin/default.nix
index 662721b..18b78aa 100644
--- a/darwin/default.nix
+++ b/darwin/default.nix
@@ -8,9 +8,9 @@
       "com.googlecode.iterm2" = import ./iterm2.nix;
       "com.apple.finder" = import ./finder.nix;
       NSGlobalDomain = {
-        AppleMeasurementUnits = "Centimeters";
-        AppleLocale = "en_CA";
         AppleLanguages = [ "en-CA" ];
+        AppleLocale = "en_CA";
+        AppleMeasurementUnits = "Centimeters";
         AppleMetricUnits = true;
         AppleTemperatureUnit = "Celsius";
         NSAutomaticCapitalizationEnabled = false;
@@ -22,8 +22,47 @@
       "com.apple.Safari" = {
         AutoOpenSafeDownloads = false;
         IncludeDevelopMenu = true;
+        ShowFullURLInSmartSearchField = true;
       };
+      "com.apple.dock" = {
+        autohide = true;
+        launchanim = false;
+        magnification = false;
+        minimize-to-application = true;
+        mru-spaces = false;
+        orientation = "bottom";
+        static-only = true;
+        tilesize = 35;
+        workspaces-swoosh-animation-off = true;
+      };
+      "com.apple.menuextra.clock" = {
+        DateFormat = "EEE d MMM HH:mm:ss";
+        FlashDateSeparators = false;
+      };
+      "com.apple.controlcenter" = {
+        "NSStatusItem Visible AccessibilityShortcuts" = false;
+        "NSStatusItem Visible AirDrop" = false;
+        "NSStatusItem Visible Battery" = true;
+        "NSStatusItem Visible Bluetooth" = true;
+        "NSStatusItem Visible Clock" = true;
+        "NSStatusItem Visible Display" = false;
+        "NSStatusItem Visible FocusModes" = false;
+        "NSStatusItem Visible NowPlaying" = true;
+        "NSStatusItem Visible ScreenMirroring" = true;
+        "NSStatusItem Visible Sound" = true;
+        "NSStatusItem Visible StageManager" = false;
+        "NSStatusItem Visible UserSwitcher" = false;
+        "NSStatusItem Visible WiFi" = true;
+      };
+      "com.apple.systempreferences" = {
+        "com.apple.preference.battery".hasBeenWarnedAboutEnergyUsage = true;
+      };
+      com.apple.appleseed.FeedbackAssistant.Autogather = false;
+      com.apple.TextEdit.RichText = false;
+    };
+    currentHostDefaults = {
+      "com.apple.controlcenter".BatteryShowPercentage = true;
+      "com.apple.dock".DidPromptSearchEngineAlert = true;
     };
-    currentHostDefaults."com.apple.controlcenter".BatteryShowPercentage = true;
   };
 }
diff --git a/darwin/finder.nix b/darwin/finder.nix
index 9663657..aad24e8 100644
--- a/darwin/finder.nix
+++ b/darwin/finder.nix
@@ -83,8 +83,12 @@ let
   } // default-view-settings;
 in
 {
+  AppleShowAllExtensions = true;
+  
   ComputerViewSettings = dvs-with-ws;
 
+  CreateDesktop = false;
+
   DesktopViewSettings = {
     GroupBy = "Kind";
   };
@@ -101,6 +105,10 @@ in
 
   FXArrangeGroupViewBy = "Name";
 
+  FXDefaultSearchScope = "SCsp";
+
+  FXEnableExtensionChangeWarning = false;
+
   FXEnableRemoveFromICloudDriveWarning = false;
 
   FXICloudDriveDocuments = true;
@@ -109,12 +117,18 @@ in
 
   FXPreferredGroupBy = "Kind";
 
+  FXPreferredViewStyle = "Nlsv";
+
   GoToField = "~/Library/";
 
   ICloudViewSettings = dvs-with-ws;
 
   NetworkViewSettings = dvs-with-ws;
 
+  NSDocumentSaveNewDocumentsToCloud = false;
+
+  NSTableViewDefaultSizeMode = 1;
+
   PackageViewSettings = dvs-with-ws;
 
   RecentsArrangeGroupViewBy = "Date Last Opened";
@@ -125,10 +139,14 @@ in
 
   ShowHardDrivesOnDesktop = false;
 
+  ShowPathbar = true;
+
   ShowRemovableMediaOnDesktop = false;
 
   ShowSidebar = true;
 
+  showWindowTitlebarIcons = false;
+
   SidebarWidth = 135;
 
   SidebarZoneOrder1 = [ "icloud_drive" "favorites" "devices" "tags" ];