diff --git a/components/smart/CodeMirror.vue b/components/smart/CodeMirror.vue
index 2280af842..58d8997fd 100644
--- a/components/smart/CodeMirror.vue
+++ b/components/smart/CodeMirror.vue
@@ -14,12 +14,13 @@ const props = withDefaults(
     value: string
     mode: string
     placeholder?: string
-    wrap: boolean
+    wrap?: boolean
     linter: LinterDefinition | null
   }>(),
   {
-    linter: null as any,
     placeholder: "",
+    wrap: true,
+    linter: null as any,
   }
 )
 
diff --git a/helpers/editor/codemirror.ts b/helpers/editor/codemirror.ts
index fc7c1f976..6681f792a 100644
--- a/helpers/editor/codemirror.ts
+++ b/helpers/editor/codemirror.ts
@@ -1,6 +1,6 @@
 import CodeMirror from "codemirror"
 
-import "codemirror/theme/base16-light.css"
+import "codemirror-github-light/lib/codemirror-github-light-theme.css"
 import "codemirror/theme/base16-dark.css"
 import "codemirror/theme/3024-night.css"
 
@@ -104,7 +104,7 @@ export function useCodemirror(
       case "system":
         return "default"
       case "light":
-        return "base16-light"
+        return "github-light"
       case "dark":
         return "base16-dark"
       case "black":
diff --git a/package-lock.json b/package-lock.json
index fa31b90ef..6dab0aed6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,6 +19,7 @@
         "acorn": "^8.5.0",
         "acorn-walk": "^8.2.0",
         "codemirror": "^5.62.3",
+        "codemirror-github-light": "^0.4.2",
         "core-js": "^3.17.2",
         "esprima": "^4.0.1",
         "firebase": "^9.0.1",
@@ -13115,6 +13116,11 @@
       "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.62.3.tgz",
       "integrity": "sha512-zZAyOfN8TU67ngqrxhOgtkSAGV9jSpN1snbl8elPtnh9Z5A11daR405+dhLzLnuXrwX0WCShWlybxPN3QC/9Pg=="
     },
+    "node_modules/codemirror-github-light": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/codemirror-github-light/-/codemirror-github-light-0.4.2.tgz",
+      "integrity": "sha1-iUl8JJWEipRaLNIaqj5Wa4d7FDU="
+    },
     "node_modules/collect-v8-coverage": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
@@ -46161,6 +46167,11 @@
       "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.62.3.tgz",
       "integrity": "sha512-zZAyOfN8TU67ngqrxhOgtkSAGV9jSpN1snbl8elPtnh9Z5A11daR405+dhLzLnuXrwX0WCShWlybxPN3QC/9Pg=="
     },
+    "codemirror-github-light": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/codemirror-github-light/-/codemirror-github-light-0.4.2.tgz",
+      "integrity": "sha1-iUl8JJWEipRaLNIaqj5Wa4d7FDU="
+    },
     "collect-v8-coverage": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
diff --git a/package.json b/package.json
index b121edec8..68477db16 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
     "acorn": "^8.5.0",
     "acorn-walk": "^8.2.0",
     "codemirror": "^5.62.3",
+    "codemirror-github-light": "^0.4.2",
     "core-js": "^3.17.2",
     "esprima": "^4.0.1",
     "firebase": "^9.0.1",