diff --git a/project.clj b/project.clj
index 8d25178..e32b94a 100644
--- a/project.clj
+++ b/project.clj
@@ -6,6 +6,7 @@
   :url "https://github.com/simon-brooke/youyesyet"
 
   :dependencies [[adl-support "0.1.6"]
+                 [binaryage/devtools "1.0.3"]
                  [bouncer "1.0.1"]
                  [ch.qos.logback/logback-classic "1.2.3"]
                  [clj-oauth "1.5.5"]
diff --git a/resources/templates/base.html b/resources/templates/base.html
index 50966a8..aac9050 100644
--- a/resources/templates/base.html
+++ b/resources/templates/base.html
@@ -6,11 +6,11 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
     <meta name="referrer" content="same-origin">
-    <link rel="stylesheet" type="text/css" href="{{servlet-context}}/css/yyy-common.css" />
-    <link rel="stylesheet" type="text/css" href="{{servlet-context}}/css/yyy-site.css" />
-    <link rel="stylesheet" type="text/css" href="{{servlet-context}}/css/spinner.css" />
+    {% style "/css/yyy-common.css" %}
+    {% style "/css/yyy-site.css" %}
+    {% style "/css/spinner.css" %}
     <link href="https://fonts.googleapis.com/css?family=Archivo+Black|Archivo+Narrow" rel="stylesheet"/>
-    <script src="{{servlet-context}}/js/lib/node_modules/jquery/dist/jquery.min.js"></script>
+    {% script "/js/lib/node_modules/jquery/dist/jquery.min.js" %}
     <title>{{site-title}}: {{title}}</title>
     {% endblock %}
     {% block extra-head %}
diff --git a/src/clj/youyesyet/middleware.clj b/src/clj/youyesyet/middleware.clj
index 4101ab1..369af13 100644
--- a/src/clj/youyesyet/middleware.clj
+++ b/src/clj/youyesyet/middleware.clj
@@ -30,7 +30,11 @@
                 (do
                   (log/debug "Taking '" (:app-context env) "' as *app-context* from env")
                   (:app-context env)))]
-      (handler (assoc request :servlet-context *app-context*)))))
+      (handler (assoc 
+                 request 
+                ;; bind both possible keys just to save grief
+                :selmer/context *app-context* 
+                :servlet-context *app-context*)))))
 
 
 (defn wrap-internal-error [handler]
diff --git a/src/cljs/youyesyet/canvasser_app/core.cljs b/src/cljs/youyesyet/canvasser_app/core.cljs
index 1537929..92afcbb 100644
--- a/src/cljs/youyesyet/canvasser_app/core.cljs
+++ b/src/cljs/youyesyet/canvasser_app/core.cljs
@@ -3,6 +3,7 @@
   youyesyet.canvasser-app.core
   (:require [ajax.core :refer [GET POST]]
             [cljsjs.leaflet]
+            [devtools.core :as devtools]
             [goog.events :as events]
             [goog.history.EventType :as HistoryEventType]
             [markdown.core :refer [md->html]]
@@ -50,6 +51,11 @@
 ;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+
+;; install tools to aid debugging in Chrome/Chromium.
+(devtools/install!)
+
+
 ;;; So that we can do debug logging!
 (enable-console-print!)