diff --git a/assets/_main.scss b/assets/_main.scss
index af592a2..923cec9 100644
--- a/assets/_main.scss
+++ b/assets/_main.scss
@@ -32,7 +32,10 @@ h5 {
 
 a {
   text-decoration: none;
-  color: var(--color-link);
+
+  &[href] {
+    color: var(--color-link);
+  }
 }
 
 img {
diff --git a/assets/_markdown.scss b/assets/_markdown.scss
index edb03e9..a0430a8 100644
--- a/assets/_markdown.scss
+++ b/assets/_markdown.scss
@@ -55,10 +55,10 @@
   a {
     text-decoration: none;
 
-    &:hover {
+    &[href]:hover {
       text-decoration: underline;
     }
-    &:visited {
+    &[href]:visited {
       color: var(--color-visited-link);
     }
   }
diff --git a/assets/_shortcodes.scss b/assets/_shortcodes.scss
index 8284ab7..2ee08bb 100644
--- a/assets/_shortcodes.scss
+++ b/assets/_shortcodes.scss
@@ -124,7 +124,7 @@
     border-radius: $border-radius;
     overflow: hidden;
     text-wrap: nowrap;
-    color: var(--color-text);
+    color: var(--body-font-color);
 
     span {
       display: inline-block;
@@ -146,7 +146,7 @@
       }
     }
   }
-  
+
   // {{< steps >}}
   .book-steps {
     >ol {
diff --git a/layouts/_shortcodes/badge.html b/layouts/_shortcodes/badge.html
index 0d4eed6..0bbfcb1 100644
--- a/layouts/_shortcodes/badge.html
+++ b/layouts/_shortcodes/badge.html
@@ -1,12 +1,5 @@
 {{- $style := default "default" (.Get "style") -}}
-{{- if .Get "href" }}
-<a href="{{ .Get "href" }}" target="_blank" class="book-badge {{ $style }}">
-  {{- with .Get "title" }}<span class="book-badge-title">{{ . | plainify }}</span>{{ end -}}
-  {{- with .Get "value" }}<span class="book-badge-value">{{ . | plainify }}</span>{{ end -}}
-</a>
-{{ else }}
 <span class="book-badge {{ $style }}">
   {{- with .Get "title" }}<span class="book-badge-title">{{ . | plainify }}</span>{{ end -}}
   {{- with .Get "value" }}<span class="book-badge-value">{{ . | plainify }}</span>{{ end -}}
-</span>
-{{ end -}}
\ No newline at end of file
+</span>
\ No newline at end of file
diff --git a/layouts/_shortcodes/columns.html b/layouts/_shortcodes/columns.html
index 1ce4ea8..1d6abdd 100644
--- a/layouts/_shortcodes/columns.html
+++ b/layouts/_shortcodes/columns.html
@@ -16,7 +16,6 @@
   }
 {{ end }}</style>{{ end -}}
 <div class="book-columns book-columns-{{ .Ordinal }} {{ with .Get "class" }}{{ . }}{{ end }}">
-  
-  {{ .Inner | safeHTML }}
+{{ .InnerDeindent | safeHTML }}
 </div>
 {{ end -}}