diff --git a/_layouts/default.html b/_layouts/default.html
index 17b9e1e69b4..c56ad5070cc 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -11,7 +11,6 @@
{% else %}
{% endif %}
-
{% if site.plugins contains "jekyll-feed" %}{% endif %}
{% if page.mathjax or site.mathjax %}
diff --git a/_sass/highlight.sass b/_sass/classes.sass
similarity index 68%
rename from _sass/highlight.sass
rename to _sass/classes.sass
index aaae7ad1d91..3f2adb91029 100644
--- a/_sass/highlight.sass
+++ b/_sass/classes.sass
@@ -1,6 +1,52 @@
-// https://github.com/richleland/pygments-css/blob/master/monokai.css
+.title
+ font-size: 1.4em
-.highlight
+.more
+ margin: 2em 0 1em
+
+.more a
+ border-radius: 2px
+ border: 1.5px solid $link-color
+ padding: .4em .8em
+ transition: .2s background, .2s color
+
+.more a:hover
+ color: #fff
+ background: $link-color
+ text-decoration: inherit
+
+.archive
+ font-size: 1.1em
+
+.archive time
+ display: inline-block
+ min-width: 10ch
+ margin: 0 .2em
+
+.icon
+ height: 1em
+ width: 1em
+ fill: currentColor
+ transition: .2s color
+ vertical-align: middle
+ margin-bottom: .15em
+
+a:hover .icon
+ color: reduce(100)
+
+.rouge-table
+ &, th, td, tr, pre
+ font-size: inherit
+ background: inherit !important
+ box-shadow: none
+ width: initial
+ margin: 0
+ padding: 0
+ .gl pre
+ margin: 0 1.5em 0 .25em
+ opacity: .5
+
+.highlight // https://github.com/richleland/pygments-css/blob/master/monokai.css
pre
background: rgba(lighten($dark, 6%), 0.9)
color: white
@@ -83,15 +129,3 @@
color: #f92672
.gi
color: #a6e22e
-
-.rouge-table
- &, th, td, tr, pre
- font-size: inherit
- background: inherit !important
- box-shadow: none
- width: initial
- margin: 0
- padding: 0
- .gl pre
- margin: 0 1.5em 0 .25em
- opacity: .5
diff --git a/assets/css/classes.sass b/assets/css/classes.sass
deleted file mode 100644
index 6870f6822bc..00000000000
--- a/assets/css/classes.sass
+++ /dev/null
@@ -1,44 +0,0 @@
----
----
-
-@import index, highlight
-
-.title
- font-size: 1.4em
-
-.archive
- font-size: 1.1em
-
-.archive time
- display: inline-block
- min-width: 10ch
- margin: 0 .2em
-
-.icon
- height: 1em
- width: 1em
- fill: currentColor
- transition: .2s color
- vertical-align: middle
- margin-bottom: .15em
-
-a:hover .icon
- color: reduce(100)
-
-{% if site.show_excerpts %}
-
-.more
- margin: 2em 0 1em
-
-.more a
- border-radius: 2px
- border: 1.5px solid $link-color
- padding: .4em .8em
- transition: .2s background, .2s color
-
-.more a:hover
- color: #fff
- background: $link-color
- text-decoration: inherit
-
-{% endif %}
diff --git a/assets/css/frame.sass b/assets/css/frame.sass
index aa427342c65..0fa4ddae3ea 100644
--- a/assets/css/frame.sass
+++ b/assets/css/frame.sass
@@ -1,7 +1,7 @@
---
---
-@import index, font, basic, layout
+@import index, font, basic, layout, classes
html
background: lighten($dark, 30%)
diff --git a/assets/css/index.sass b/assets/css/index.sass
index 006b80a3e28..32455b6d9ae 100644
--- a/assets/css/index.sass
+++ b/assets/css/index.sass
@@ -1,7 +1,7 @@
---
---
-@import index, font, basic, layout
+@import index, font, basic, layout, classes
body > header, body > article, body > footer
padding: 1.5em