diff --git a/frappe/public/scss/website.scss b/frappe/public/scss/website.scss
index cd38ccfc85..2c22a7f571 100644
--- a/frappe/public/scss/website.scss
+++ b/frappe/public/scss/website.scss
@@ -43,7 +43,6 @@ body {
 }
 
 .breadcrumb {
-    font-size: 0.75rem;
     padding-left: 0;
     padding-right: 0;
     background-color: white;
@@ -61,10 +60,6 @@ img {
 	@extend .d-none;
 }
 
-.btn-primary {
-	color: $white;
-}
-
 .text-underline {
 	text-decoration: underline;
 }
@@ -75,6 +70,14 @@ img {
 	border-top: 1px solid $border-color;
 }
 
+.footer-group-label {
+	color: $text-muted;
+}
+
+.footer-parent-item {
+	margin-bottom: 1rem;
+}
+
 .no-underline {
     text-decoration: none !important;
 }
@@ -92,5 +95,3 @@ img {
     width: 1.5rem;
     height: 1.5rem;
 }
-
-
diff --git a/frappe/templates/includes/footer/footer_items.html b/frappe/templates/includes/footer/footer_items.html
index 409d702d4d..3df37f79ec 100644
--- a/frappe/templates/includes/footer/footer_items.html
+++ b/frappe/templates/includes/footer/footer_items.html
@@ -7,7 +7,7 @@
             {% if page.child_items %} onclick="return false;" {% endif %}
             {{ page.target or ''}}>
             {%- if page.child_items -%}
-                <div class="footer-group-label footer-parent-item text-muted mb-3">{{ page.label }}</div>
+                <div class="footer-group-label footer-parent-item">{{ page.label }}</div>
                 </a>
                 <ul class="list-unstyled">
                 {%- for child in page.child_items -%}
@@ -18,7 +18,7 @@
                 {%- endfor -%}
                 </ul>
             {%- else -%}
-            <div class="footer-group-label text-muted">{{ page.label }}<div>
+            <div class="footer-group-label">{{ page.label }}<div>
             </a>
             {%- endif -%}
             </div>
diff --git a/frappe/website/doctype/website_theme/website_theme.py b/frappe/website/doctype/website_theme/website_theme.py
index f0a29ff87c..069293265d 100644
--- a/frappe/website/doctype/website_theme/website_theme.py
+++ b/frappe/website/doctype/website_theme/website_theme.py
@@ -70,7 +70,7 @@ class WebsiteTheme(Document):
 		stdout, stderr = process.communicate()
 
 		if stderr:
-			frappe.throw('<pre>{stderr}</pre>'.format(stderr=stderr))
+			frappe.throw('<pre>{stderr}</pre>'.format(stderr=frappe.safe_encode(stderr)))
 		else:
 			self.custom_theme_url = '/assets/frappe/website_theme/' + file_name