diff --git a/assets/css/custom.css b/assets/css/custom.css
deleted file mode 100644
index ed4b5e9..0000000
--- a/assets/css/custom.css
+++ /dev/null
@@ -1 +0,0 @@
-/* Custom CSS */
\ No newline at end of file
diff --git a/assets/js/custom.js b/assets/js/custom.js
deleted file mode 100644
index 37abee0..0000000
--- a/assets/js/custom.js
+++ /dev/null
@@ -1,14 +0,0 @@
-var btn = $('#back-to-top');
-
-$(window).scroll(function() {
-  if ($(window).scrollTop() > 300) {
-    btn.addClass('show');
-  } else {
-    btn.removeClass('show');
-  }
-});
-
-btn.on('click', function(e) {
-  e.preventDefault();
-  $('html, body').animate({scrollTop:0}, '300');
-});
\ No newline at end of file
diff --git a/future2021.php b/future2021.php
index 716bbe3..92680ee 100644
--- a/future2021.php
+++ b/future2021.php
@@ -4,11 +4,34 @@ namespace Grav\Theme;
 use Grav\Common\Grav;
 use Grav\Common\Theme;
 
+/**
+ * Future2021 Theme
+ *
+ * Class Future2021
+ *
+ * @category Extensions
+ * @package  Grav\Theme
+ * @author   Pedro Moreno <https://github.com/pmoreno-rodriguez>
+ * @license  http://www.opensource.org/licenses/mit-license.html MIT License
+ * @link     https://github.com/pmoreno-rodriguez/grav-theme-future2021
+ */
+
+
 class Future2021 extends Theme
 {
-    public function onThemeInitialized()
+    public function onTwigSiteVariables ()
     {
+        $themeConfig = $this->config->get('themes.future2021');
 
+        // Add custom.css and custom.js assets if they exists
+
+        if (isset($themeConfig['custom_css']) && $themeConfig['custom_css'] && file_exists(__DIR__ . '/assets/css/custom.css')) {
+            $this->grav['assets']->addCss('theme://assets/css/custom.css', ['priority' => 5]);
+        }
+
+        if (isset($themeConfig['custom_js']) && $themeConfig['custom_js'] && file_exists(__DIR__ . '/assets/js/custom.js')) {
+            $this->grav['assets']->addJs('theme://assets/js/custom.js', ['group' => 'bottom', 'priority' => 15]);
+        }
     }
 
     // Add images to twig template paths to allow inclusion of SVG files
diff --git a/languages.yaml b/languages.yaml
index b4fbd7a..c39038b 100755
--- a/languages.yaml
+++ b/languages.yaml
@@ -16,6 +16,10 @@ en:
         TYPE_LOGO_HEADER_TEXT: Text
         TYPE_LOGO_HEADER_BOTH: Both
         SLOGAN: Slogan
+        CUSTOM_CSS: Load Custom CSS
+        CUSTOM_CSS_HELP: Load custom CSS styles from theme://assets/css/custom.css
+        CUSTOM_JS: Load Custom JS
+        CUSTOM_JS_HELP: Load custom JS from theme://assets/css/custom.js
         MENU:
           TITLE: Top Menu Configuration
           LANGSWITCHER: Enable Langswitcher icon
@@ -299,6 +303,10 @@ de:
         TYPE_LOGO_HEADER_TEXT: Text
         TYPE_LOGO_HEADER_BOTH: Beide
         SLOGAN: Motto
+        CUSTOM_CSS: Benutzerdefiniertes CSS laden
+        CUSTOM_CSS_HELP: Benutzerdefinierte CSS-Stile aus theme://assets/css/custom.css laden
+        CUSTOM_JS: Benutzerdefiniertes JS laden
+        CUSTOM_JS_HELP: Benutzerdefiniertes JS aus theme://assets/css/custom.js laden
         MENU:
           TITLE: Menü-Konfiguration
           LANGSWITCHER: Sprachauswahl aktivieren
@@ -579,6 +587,10 @@ es:
         TYPE_LOGO_HEADER_TEXT: Texto
         TYPE_LOGO_HEADER_BOTH: Ambos
         SLOGAN: Slogan
+        CUSTOM_CSS: Cargar CSS personalizado
+        CUSTOM_CSS_HELP: Carga los estilos CSS personalizados desde theme://assets/css/custom.css
+        CUSTOM_JS: Cargar JS personalizado
+        CUSTOM_JS_HELP: Carga JS personalizado desde theme://assets/css/custom.js
         MENU:
           TITLE: Configuración del Menú Superior
           LANGSWITCHER: Habilitar icono Idioma
@@ -862,6 +874,10 @@ nl:
         TYPE_LOGO_HEADER_TEXT: Tekst
         TYPE_LOGO_HEADER_BOTH: Beide
         SLOGAN: Leuze
+        CUSTOM_CSS: Aangepaste CSS laden
+        CUSTOM_CSS_HELP: Laad aangepaste CSS-stijlen van theme://assets/css/custom.css
+        CUSTOM_JS: Aangepaste JS laden
+        CUSTOM_JS_HELP: Laad aangepaste JS van theme://assets/css/custom.js
         MENU:
           TITLE: Topmenuconfiguratie
           LANGSWITCHER: Icoon taalkeuze inschakelen