diff --git a/build.clj b/build.clj
index 86aaee8d..6a2f10b6 100644
--- a/build.clj
+++ b/build.clj
@@ -77,7 +77,7 @@
    :theme-rise
    {:lib 'systems.bread/bread-theme-rise
     :aliases [:theme-rise]
-    :src-dirs ["cms/themes/rise" "resources/rise"]}
+    :src-dirs ["cms/themes/rise/src" "cms/themes/rise/resources"]}
 
    ;; TODO CRUST
 
@@ -91,7 +91,7 @@
   (let [{:keys [aliases lib src-dirs]} (get libs (:lib opts :core))
         jar-file (jar-path lib patch-version)]
     ;; Prevent pollution from previous builds.
-    (b/delete {:path class-dir})
+    (clean nil)
     (b/write-pom {:class-dir class-dir
                   :lib lib
                   :version patch-version
diff --git a/cms/themes/rise/src/systems/bread/alpha/cms/theme/rise.cljc b/cms/themes/rise/src/systems/bread/alpha/cms/theme/rise.cljc
index 467c41bf..b7d296f6 100644
--- a/cms/themes/rise/src/systems/bread/alpha/cms/theme/rise.cljc
+++ b/cms/themes/rise/src/systems/bread/alpha/cms/theme/rise.cljc
@@ -98,6 +98,7 @@
     [:html {:lang lang :dir dir}
      [:head
       [:meta {:content-type :utf-8}]
+      [:meta {:name :viewport :content "width=device-width, initial-scale=1"}]
       (hook ::theme/html.title
             [:title (theme/title title (:site/name config))]
             title)
@@ -229,7 +230,7 @@
 
 (defc ResetPasswordPage
   [{:as data
-    :keys [config hook i18n session dir totp ring/anti-forgery-token-field]
+    :keys [config hook i18n session dir ring/anti-forgery-token-field]
     :auth/keys [result]}]
   {:extends Page
    :doc
@@ -246,8 +247,7 @@
       :description
       "A valid code must be present in the query string."
       :args ({})}]}
-  (let [{:keys [totp-key issuer]} totp
-        user (or (:user session) (:auth/user session))
+  (let [user (or (:user session) (:auth/user session))
         error? (false? (:valid result))]
     {:title (:auth/reset-password i18n)
      :content
diff --git a/deps.edn b/deps.edn
index 408cb3db..f34580aa 100644
--- a/deps.edn
+++ b/deps.edn
@@ -87,8 +87,9 @@
 
   :auth
   {:extra-paths ["plugins/auth"]
-   :extra-deps {buddy/buddy-hashers {:mvn/version "2.0.167"}
-                one-time/one-time   {:mvn/version "0.8.0"}}}
+   :extra-deps {buddy/buddy-hashers         {:mvn/version "2.0.167"}
+                crypto-random/crypto-random {:mvn/version "1.2.1"}
+                one-time/one-time           {:mvn/version "0.8.0"}}}
 
   :bidi
   {:extra-paths ["plugins/bidi"]
diff --git a/plugins/auth/systems/bread/alpha/plugin/account.cljc b/plugins/auth/systems/bread/alpha/plugin/account.cljc
index b65dad3b..3eb957b8 100644
--- a/plugins/auth/systems/bread/alpha/plugin/account.cljc
+++ b/plugins/auth/systems/bread/alpha/plugin/account.cljc
@@ -316,8 +316,8 @@
       :action/description "Merge strings for account page into global i18n strings."
       :strings (i18n/read-strings "account.i18n.edn")}]}
    :config
-   {:account/account-uri account-uri
-    :account/timezone-options timezone-options
-    :account/html.account.header html-account-header
-    :account/html.account.sections html-account-sections
-    :account/html.account.form html-account-form}})
+   #:account{:account-uri account-uri
+             :timezone-options timezone-options
+             :html.account.header html-account-header
+             :html.account.sections html-account-sections
+             :html.account.form html-account-form}})
diff --git a/plugins/theme/systems/bread/alpha/cms/theme.cljc b/plugins/theme/systems/bread/alpha/cms/theme.cljc
index 0ba74d9d..05aa7729 100644
--- a/plugins/theme/systems/bread/alpha/cms/theme.cljc
+++ b/plugins/theme/systems/bread/alpha/cms/theme.cljc
@@ -4,7 +4,6 @@
     [markdown-to-hiccup.core :as md2h]
     [rum.core :as rum]
 
-    [systems.bread.alpha.core :as bread]
     [systems.bread.alpha.component :refer [defc] :as component]))
 
 (defn title [& strs]