diff --git a/ghost/admin/app/styles/app-dark.css b/ghost/admin/app/styles/app-dark.css
index 7151d44686..185dff44fd 100644
--- a/ghost/admin/app/styles/app-dark.css
+++ b/ghost/admin/app/styles/app-dark.css
@@ -4,7 +4,7 @@
     includes normalize v7 so must come first to avoid clobbering
     our old non-Spirit classes
 */
-@import "spirit/spirit-product.css";
+@import "spirit/spirit-product-dark.css";
 
 /* Patterns: Groups of Styles
 /* ---------------------------------------------------------- */
diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card-image.hbs b/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card-image.hbs
index 2b9d212d8f..515d813018 100644
--- a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card-image.hbs
+++ b/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-card-image.hbs
@@ -54,10 +54,10 @@
             <input
                 value={{payload.caption}}
                 type="text"
-                class="miw-100 tc bn form-text"
+                class="miw-100 tc bn form-text bg-transparent"
                 name="caption"
                 oninput={{action "updateCaption" value="target.value"}}
                 placeholder="Type caption for image (optional)">
         </figcaption>
     {{/if}}
-{{/koenig-card}}
\ No newline at end of file
+{{/koenig-card}}
diff --git a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-link-toolbar.hbs b/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-link-toolbar.hbs
index 24ef12d50b..62579b1385 100644
--- a/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-link-toolbar.hbs
+++ b/ghost/admin/lib/koenig-editor/addon/templates/components/koenig-link-toolbar.hbs
@@ -1,5 +1,5 @@
 {{#if showToolbar}}
-    <ul class="bg-darkgrey-d1 inline-flex pa0 ma0 list br3 shadow-2 items-center relative white f-small fw3 tracked-2 nudge-top--1">
+    <ul class="kg-link-toolbar bg-darkgrey-d1 inline-flex pa0 ma0 list br3 shadow-2 items-center relative white f-small fw3 tracked-2 nudge-top--1">
         <li class="mw70 ma0 truncate">
             <a href="{{url}}" class="dib dim-lite pa3 pr1 link white" target="_blank" rel="noopener noreferrer">{{url}}</a>
         </li>
diff --git a/ghost/admin/package.json b/ghost/admin/package.json
index 71070047d7..2227537fdc 100644
--- a/ghost/admin/package.json
+++ b/ghost/admin/package.json
@@ -97,7 +97,7 @@
     "eslint": "4.19.1",
     "eslint-plugin-ghost": "0.0.25",
     "fs-extra": "4.0.3",
-    "ghost-spirit": "0.0.20",
+    "ghost-spirit": "0.0.21",
     "glob": "7.1.2",
     "google-caja-bower": "https://github.com/acburdine/google-caja-bower#ghost",
     "grunt": "1.0.3",
diff --git a/ghost/admin/yarn.lock b/ghost/admin/yarn.lock
index 522ca8872d..8737b49e62 100644
--- a/ghost/admin/yarn.lock
+++ b/ghost/admin/yarn.lock
@@ -5338,7 +5338,26 @@ ghost-ignition@^2.7.0:
     prettyjson "^1.1.3"
     uuid "^3.0.0"
 
-ghost-spirit@0.0.20, ghost-spirit@>=0.0.18:
+ghost-spirit@0.0.21:
+  version "0.0.21"
+  resolved "https://registry.yarnpkg.com/ghost-spirit/-/ghost-spirit-0.0.21.tgz#19eca18d3d0be3fe1b20d8add16db23e4a3040ff"
+  dependencies:
+    autoprefixer "8.2.0"
+    bluebird "^3.4.6"
+    connect-slashes "^1.3.1"
+    cssnano "^4.0.0-rc.2"
+    express "^4.14.0"
+    express-hbs "^1.0.2"
+    ghost-ignition "^2.7.0"
+    gulp-postcss "7.0.1"
+    lodash "^4.15.0"
+    postcss-color-mod-function "2.4.2"
+    postcss-custom-media "6.0.0"
+    postcss-custom-properties "7.0.0"
+    postcss-easy-import "3.0.0"
+    postcss-prefix-selector "1.6.0"
+
+ghost-spirit@>=0.0.18:
   version "0.0.20"
   resolved "https://registry.yarnpkg.com/ghost-spirit/-/ghost-spirit-0.0.20.tgz#fb837d7bf2513155244648074f1ee497fda6f6e4"
   dependencies: