diff --git a/system/src/Grav/Common/Twig/TwigExtension.php b/system/src/Grav/Common/Twig/TwigExtension.php
index 56e659fde..a927817ed 100644
--- a/system/src/Grav/Common/Twig/TwigExtension.php
+++ b/system/src/Grav/Common/Twig/TwigExtension.php
@@ -137,6 +137,8 @@ class TwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsIn
             new \Twig_SimpleFunction('isajaxrequest', [$this, 'isAjaxFunc']),
             new \Twig_SimpleFunction('exif', [$this, 'exifFunc']),
             new \Twig_SimpleFunction('media_directory', [$this, 'mediaDirFunc']),
+            new \Twig_SimpleFunction('body_class', [$this, 'bodyClassFunc']),
+            new \Twig_SimpleFunction('theme_var', [$this, 'themeVarFunc']),
 
         ];
     }
@@ -1124,4 +1126,40 @@ class TwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsIn
 
         return number_format($n);
     }
+
+    /**
+     * Get a theme variable
+     *
+     * @param $var
+     * @return string
+     */
+    public function themeVarFunc($var)
+    {
+        return $this->config->get('theme.' . $var, false) ?: '';
+    }
+
+    /**
+     * takes an array of classes, and if they are not set on body_classes
+     * look to see if they are set in theme config
+     *
+     * @param $classes
+     * @return string
+     */
+    public function bodyClassFunc($classes)
+    {
+
+        $header = $this->grav['page']->header();
+        $body_classes = isset($header->body_classes) ? $header->body_classes : '';
+
+        foreach ((array)$classes as $class) {
+            if (!empty($body_classes) && Utils::contains($body_classes, $class)) {
+                continue;
+            } else {
+                $val = $this->config->get('theme.' . $class, false) ? $class : false;
+                $body_classes .= $val ? ' ' . $val : '';
+            }
+        }
+
+        return $body_classes;
+    }
 }