diff --git a/src/sass/_base.scss b/src/sass/_base.scss
index c42f36b..f7062a6 100644
--- a/src/sass/_base.scss
+++ b/src/sass/_base.scss
@@ -430,7 +430,7 @@ img {
     width: $padding-16;
     height: $padding-16;
 
-    border: $padding-1 solid transparent;
+    border: $border-2 solid transparent;
     border-top-color: $body-font-color;
     border-radius: 50%;
 
diff --git a/src/sass/_defaults.scss b/src/sass/_defaults.scss
index adc8ce4..333bdef 100644
--- a/src/sass/_defaults.scss
+++ b/src/sass/_defaults.scss
@@ -1,5 +1,5 @@
 // Used in layout
-$padding-1: 1px !default;
+$padding-2: 0.125rem !default;
 $padding-4: 0.25rem !default;
 $padding-8: 0.5rem !default;
 $padding-16: 1rem !default;
@@ -9,6 +9,10 @@ $font-size-base: 16px !default;
 $font-size-12: 0.75rem !default;
 $font-size-14: 0.875rem !default;
 $font-size-16: 1rem !default;
+$font-size-32: 2rem !default;
+
+$border-2: 0.125rem !default;
+$border-4: 0.25rem !default;
 
 $border-radius: 0.15rem !default;
 
diff --git a/src/sass/_markdown.scss b/src/sass/_markdown.scss
index 904e2f1..4f08921 100644
--- a/src/sass/_markdown.scss
+++ b/src/sass/_markdown.scss
@@ -99,7 +99,7 @@
     margin: $padding-16 0;
     padding: $padding-8 $padding-16 $padding-8 ($padding-16 - $padding-4); //to keep total left space 16dp
 
-    border-left: $padding-4 solid $gray-200;
+    border-left: $border-4 solid $gray-200;
     border-radius: $border-radius;
 
     :first-child {
@@ -121,7 +121,7 @@
     tr th,
     tr td {
       padding: $padding-8 $padding-16;
-      border: $padding-1 solid $gray-200;
+      border: $border-2 solid $gray-200;
     }
 
     tr:nth-child(2n) {
@@ -130,7 +130,7 @@
   }
 
   hr {
-    height: $padding-1;
+    height: $padding-2;
     border: none;
     background: $gray-200;
   }
diff --git a/src/sass/_shortcodes.scss b/src/sass/_shortcodes.scss
index a5cb6ac..f811b58 100644
--- a/src/sass/_shortcodes.scss
+++ b/src/sass/_shortcodes.scss
@@ -3,7 +3,7 @@
   margin-top: $padding-16;
   margin-bottom: $padding-16;
 
-  border: $padding-1 solid $gray-200;
+  border: $border-2 solid $gray-200;
   border-radius: $border-radius;
 
   overflow: hidden;
@@ -33,7 +33,7 @@
   margin-top: $padding-16;
   margin-bottom: $padding-16;
 
-  border: $padding-1 solid $gray-200;
+  border: $border-2 solid $gray-200;
   border-radius: $border-radius;
 
   overflow: hidden;
@@ -44,20 +44,20 @@
   &__label {
     display: inline-block;
     padding: $padding-8 $padding-16;
-    border-bottom: $padding-1 transparent;
+    border-bottom: $border-2 transparent;
     cursor: pointer;
   }
 
   &__content {
     order: 999; //Move content blocks to the end
     width: 100%;
-    border-top: $padding-1 solid $gray-100;
+    border-top: $border-2 solid $gray-100;
     padding: $padding-16;
     display: none;
   }
 
   &__control:checked + &__label {
-    border-bottom: $padding-1 solid $color-link;
+    border-bottom: $border-2 solid $color-link;
   }
   &__control:checked + &__label + &__content {
     display: block;
@@ -84,7 +84,7 @@
 .gdoc-button {
   display: inline-block;
   color: $gray-700;
-  border: $padding-1 solid $gray-500;
+  border: $border-2 solid $gray-500;
   border-radius: $border-radius;
   margin: $padding-8 0;
   cursor: pointer;