diff --git a/CodeEdit.xcodeproj/project.pbxproj b/CodeEdit.xcodeproj/project.pbxproj
index 7d9381645..184f3d260 100644
--- a/CodeEdit.xcodeproj/project.pbxproj
+++ b/CodeEdit.xcodeproj/project.pbxproj
@@ -441,8 +441,8 @@
 		28A51004281701B40087B0CC /* codeedit-github-dark.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "codeedit-github-dark.json"; sourceTree = "<group>"; };
 		28B0A19727E385C300B73177 /* NavigatorSidebarToolbarTop.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = NavigatorSidebarToolbarTop.swift; sourceTree = "<group>"; tabWidth = 4; };
 		28B8F883280FFE4600596236 /* NSTableView+Background.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSTableView+Background.swift"; sourceTree = "<group>"; };
-		28F43DDF29738792008BBA45 /* codeedit-solarized-dark.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "codeedit-solarized-dark.json"; sourceTree = "<group>"; };
-		28F43DE1297388C5008BBA45 /* codeedit-solarized-light.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "codeedit-solarized-light.json"; sourceTree = "<group>"; };
+		28F43DDF29738792008BBA45 /* codeedit-solarized-dark.json */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = text.json; path = "codeedit-solarized-dark.json"; sourceTree = "<group>"; tabWidth = 2; };
+		28F43DE1297388C5008BBA45 /* codeedit-solarized-light.json */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = text.json; path = "codeedit-solarized-light.json"; sourceTree = "<group>"; tabWidth = 2; };
 		28FFE1BE27E3A441001939DB /* NavigatorSidebarToolbarBottom.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = NavigatorSidebarToolbarBottom.swift; sourceTree = "<group>"; tabWidth = 4; };
 		2B15CA0028254139004E8F22 /* OpenWithCodeEdit.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = OpenWithCodeEdit.entitlements; sourceTree = "<group>"; };
 		2B7AC06A282452FB0082A5B8 /* Media.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Media.xcassets; sourceTree = "<group>"; };
diff --git a/CodeEdit/DefaultThemes/codeedit-solarized-dark.json b/CodeEdit/DefaultThemes/codeedit-solarized-dark.json
index e6bb8d11c..16ca9ec3c 100644
--- a/CodeEdit/DefaultThemes/codeedit-solarized-dark.json
+++ b/CodeEdit/DefaultThemes/codeedit-solarized-dark.json
@@ -1,125 +1,125 @@
 {
-  "author" : "CodeEdit",
-  "displayName" : "Solarized Dark",
-  "editor" : {
-    "characters" : {
-      "color" : "#DC322F"
+  "author": "CodeEdit",
+  "description": "Solarized dark theme.",
+  "displayName": "Solarized Dark",
+  "distributionURL": "https://github.com/CodeEditApp/CodeEdit",
+  "editor": {
+    "attributes": {
+      "color": "#6C71C4"
     },
-    "comments" : {
-      "color" : "#586E75"
+    "background": {
+      "color": "#002B36"
     },
-    "numbers" : {
-      "color" : "#DC322F"
+    "characters": {
+      "color": "#DC322F"
     },
-    "commands" : {
-      "color" : "#CB4B16"
+    "commands": {
+      "color": "#CB4B16"
     },
-    "lineHighlight" : {
-      "color" : "#073642"
+    "comments": {
+      "color": "#586E75"
     },
-    "values" : {
-      "color" : "#D33682"
+    "insertionPoint": {
+      "color": "#839496"
     },
-    "background" : {
-      "color" : "#002B36"
+    "invisibles": {
+      "color": "#073642"
     },
-    "keywords" : {
-      "color" : "#859900"
+    "keywords": {
+      "color": "#859900"
     },
-    "text" : {
-      "color" : "#839496"
+    "lineHighlight": {
+      "color": "#073642"
     },
-    "invisibles" : {
-      "color" : "#073642"
+    "numbers": {
+      "color": "#DC322F"
     },
-    "insertionPoint" : {
-      "color" : "#839496"
+    "selection": {
+      "color": "#586E75"
     },
-    "strings" : {
-      "color" : "#2AA198"
+    "strings": {
+      "color": "#2AA198"
     },
-    "selection" : {
-      "color" : "#586E75"
+    "text": {
+      "color": "#839496"
     },
-    "types" : {
-      "color" : "#268BD2"
+    "types": {
+      "color": "#268BD2"
     },
-    "variables" : {
-      "color" : "#B58900"
+    "values": {
+      "color": "#D33682"
     },
-    "attributes" : {
-      "color" : "#6C71C4"
+    "variables": {
+      "color": "#B58900"
     }
   },
-  "distributionURL" : "https:\/\/github.com\/CodeEditApp\/CodeEdit",
-  "terminal" : {
-    "white" : {
-      "color" : "#EEE8D5"
+  "license": "MIT",
+  "name": "codeedit-solarized-dark",
+  "terminal": {
+    "background": {
+      "color": "#002B36"
     },
-    "brightMagenta" : {
-      "color" : "#6C71C4"
+    "black": {
+      "color": "#073642"
     },
-    "brightRed" : {
-      "color" : "#CB4B16"
+    "blue": {
+      "color": "#268BD2"
     },
-    "blue" : {
-      "color" : "#268BD2"
+    "boldText": {
+      "color": "#839496"
     },
-    "red" : {
-      "color" : "#DC322F"
+    "brightBlack": {
+      "color": "#002B36"
     },
-    "green" : {
-      "color" : "#859900"
+    "brightBlue": {
+      "color": "#839496"
     },
-    "boldText" : {
-      "color" : "#839496"
+    "brightCyan": {
+      "color": "#93A1A1"
     },
-    "brightGreen" : {
-      "color" : "#586E75"
+    "brightGreen": {
+      "color": "#586E75"
     },
-    "background" : {
-      "color" : "#002B36"
+    "brightMagenta": {
+      "color": "#6C71C4"
     },
-    "cursor" : {
-      "color" : "#839496"
+    "brightRed": {
+      "color": "#CB4B16"
     },
-    "selection" : {
-      "color" : "#073642"
+    "brightWhite": {
+      "color": "#FDF6E3"
     },
-    "magenta" : {
-      "color" : "#D33682"
+    "brightYellow": {
+      "color": "#657B83"
     },
-    "black" : {
-      "color" : "#073642"
+    "cursor": {
+      "color": "#839496"
     },
-    "text" : {
-      "color" : "#839496"
+    "cyan": {
+      "color": "#2AA198"
     },
-    "brightWhite" : {
-      "color" : "#FDF6E3"
+    "green": {
+      "color": "#859900"
     },
-    "brightBlue" : {
-      "color" : "#839496"
+    "magenta": {
+      "color": "#D33682"
     },
-    "brightYellow" : {
-      "color" : "#657B83"
+    "red": {
+      "color": "#DC322F"
     },
-    "cyan" : {
-      "color" : "#2AA198"
+    "selection": {
+      "color": "#073642"
     },
-    "yellow" : {
-      "color" : "#B58900"
+    "text": {
+      "color": "#839496"
     },
-    "brightCyan" : {
-      "color" : "#93A1A1"
+    "white": {
+      "color": "#EEE8D5"
     },
-    "brightBlack" : {
-      "color" : "#002B36"
+    "yellow": {
+      "color": "#B58900"
     }
   },
-  "version" : "0.0.1",
-  "license" : "MIT",
-  "type" : "dark",
-  "name" : "codeedit-solarized-dark",
-  "description" : "Solarized dark theme."
+  "type": "dark",
+  "version": "0.0.1"
 }
diff --git a/CodeEdit/DefaultThemes/codeedit-solarized-light.json b/CodeEdit/DefaultThemes/codeedit-solarized-light.json
index 0523ad50e..bd038e77f 100644
--- a/CodeEdit/DefaultThemes/codeedit-solarized-light.json
+++ b/CodeEdit/DefaultThemes/codeedit-solarized-light.json
@@ -1,125 +1,125 @@
 {
-  "author" : "CodeEdit",
-  "displayName" : "Solarized Light",
-  "editor" : {
-    "characters" : {
-      "color" : "#DC322F"
+  "author": "CodeEdit",
+  "description": "Solarized light theme.",
+  "displayName": "Solarized Light",
+  "distributionURL": "https://github.com/CodeEditApp/CodeEdit",
+  "editor": {
+    "attributes": {
+      "color": "#6C71C4"
     },
-    "comments" : {
-      "color" : "#93A1A1"
+    "background": {
+      "color": "#FDF6E3"
     },
-    "numbers" : {
-      "color" : "#DC322F"
+    "characters": {
+      "color": "#DC322F"
     },
-    "commands" : {
-      "color" : "#CB4B16"
+    "commands": {
+      "color": "#CB4B16"
     },
-    "lineHighlight" : {
-      "color" : "#EEE8D5"
+    "comments": {
+      "color": "#93A1A1"
     },
-    "values" : {
-      "color" : "#D33682"
+    "insertionPoint": {
+      "color": "#657B83"
     },
-    "background" : {
-      "color" : "#FDF6E3"
+    "invisibles": {
+      "color": "#EEE8D5"
     },
-    "keywords" : {
-      "color" : "#859900"
+    "keywords": {
+      "color": "#859900"
     },
-    "text" : {
-      "color" : "#657B83"
+    "lineHighlight": {
+      "color": "#EEE8D5"
     },
-    "invisibles" : {
-      "color" : "#EEE8D5"
+    "numbers": {
+      "color": "#DC322F"
     },
-    "insertionPoint" : {
-      "color" : "#657B83"
+    "selection": {
+      "color": "#93A1A1"
     },
-    "strings" : {
-      "color" : "#2AA198"
+    "strings": {
+      "color": "#2AA198"
     },
-    "selection" : {
-      "color" : "#93A1A1"
+    "text": {
+      "color": "#657B83"
     },
-    "types" : {
-      "color" : "#268BD2"
+    "types": {
+      "color": "#268BD2"
     },
-    "variables" : {
-      "color" : "#B58900"
+    "values": {
+      "color": "#D33682"
     },
-    "attributes" : {
-      "color" : "#6C71C4"
+    "variables": {
+      "color": "#B58900"
     }
   },
-  "distributionURL" : "https:\/\/github.com\/CodeEditApp\/CodeEdit",
-  "terminal" : {
-    "white" : {
-      "color" : "#EEE8D5"
+  "license": "MIT",
+  "name": "codeedit-solarized-light",
+  "terminal": {
+    "background": {
+      "color": "#FDF6E3"
     },
-    "brightMagenta" : {
-      "color" : "#6C71C4"
+    "black": {
+      "color": "#073642"
     },
-    "brightRed" : {
-      "color" : "#CB4B16"
+    "blue": {
+      "color": "#268BD2"
     },
-    "blue" : {
-      "color" : "#268BD2"
+    "boldText": {
+      "color": "#586E75"
     },
-    "red" : {
-      "color" : "#DC322F"
+    "brightBlack": {
+      "color": "#002B36"
     },
-    "green" : {
-      "color" : "#859900"
+    "brightBlue": {
+      "color": "#839496"
     },
-    "boldText" : {
-      "color" : "#586E75"
+    "brightCyan": {
+      "color": "#93A1A1"
     },
-    "brightGreen" : {
-      "color" : "#586E75"
+    "brightGreen": {
+      "color": "#586E75"
     },
-    "background" : {
-      "color" : "#FDF6E3"
+    "brightMagenta": {
+      "color": "#6C71C4"
     },
-    "cursor" : {
-      "color" : "#657B83"
+    "brightRed": {
+      "color": "#CB4B16"
     },
-    "selection" : {
-      "color" : "#EEE8D5"
+    "brightWhite": {
+      "color": "#FDF6E3"
     },
-    "magenta" : {
-      "color" : "#D33682"
+    "brightYellow": {
+      "color": "#657B83"
     },
-    "black" : {
-      "color" : "#073642"
+    "cursor": {
+      "color": "#657B83"
     },
-    "text" : {
-      "color" : "#657B83"
+    "cyan": {
+      "color": "#2AA198"
     },
-    "brightWhite" : {
-      "color" : "#FDF6E3"
+    "green": {
+      "color": "#859900"
     },
-    "brightBlue" : {
-      "color" : "#839496"
+    "magenta": {
+      "color": "#D33682"
     },
-    "brightYellow" : {
-      "color" : "#657B83"
+    "red": {
+      "color": "#DC322F"
     },
-    "cyan" : {
-      "color" : "#2AA198"
+    "selection": {
+      "color": "#EEE8D5"
     },
-    "yellow" : {
-      "color" : "#B58900"
+    "text": {
+      "color": "#657B83"
     },
-    "brightCyan" : {
-      "color" : "#93A1A1"
+    "white": {
+      "color": "#EEE8D5"
     },
-    "brightBlack" : {
-      "color" : "#002B36"
+    "yellow": {
+      "color": "#B58900"
     }
   },
-  "version" : "0.0.1",
-  "license" : "MIT",
-  "type" : "light",
-  "name" : "codeedit-solarized-light",
-  "description" : "Solarized light theme."
+  "type": "light",
+  "version": "0.0.1"
 }