diff --git a/panoramix/config.py b/panoramix/config.py
index 2b05cffbcfc8d..27699b0573772 100644
--- a/panoramix/config.py
+++ b/panoramix/config.py
@@ -114,23 +114,22 @@
 
 # ---------------------------------------------------
 # Theme configuration
-# these are located on static/appbuilder/css/themes
-# you can create your own and easily use them placing them on the
-# same dir structure to override
 # ---------------------------------------------------
-# APP_THEME = "bootstrap-theme.css"  # default bootstrap
-# APP_THEME = "cerulean.css"
-# APP_THEME = "amelia.css"
-# APP_THEME = "cosmo.css"
-# APP_THEME = "cyborg.css"
-# APP_THEME = "flatly.css"
-# APP_THEME = "journal.css"
-# APP_THEME = "readable.css"
-# APP_THEME = "simplex.css"
-# APP_THEME = "slate.css"
-# APP_THEME = "spacelab.css"
-# APP_THEME = "united.css"
-# APP_THEME = "yeti.css"
+CSS_THEME = '/static/assets/stylesheets/themes/panoramix-bootstrap-theme.css'
+# CSS_THEME = '/static/assets/stylesheets/themes/bootswatch.paper.min.css'
+# CSS_THEME = "/static/appbuilder/css/bootstrap.min.css"  # default bootstrap
+# CSS_THEME = "/static/appbuilder/css/themes/cerulean.css"
+# CSS_THEME = "/static/appbuilder/css/themes/amelia.css"
+# CSS_THEME = "/static/appbuilder/css/themes/cosmo.css"
+# CSS_THEME = "/static/appbuilder/css/themes/cyborg.css"
+# CSS_THEME = "/static/appbuilder/css/themes/flatly.css"
+# CSS_THEME = "/static/appbuilder/css/themes/journal.css"
+# CSS_THEME = "/static/appbuilder/css/themes/readable.css"
+# CSS_THEME = "/static/appbuilder/css/themes/simplex.css"
+# CSS_THEME = "/static/appbuilder/css/themes/slate.css"
+# CSS_THEME = "/static/appbuilder/css/themes/spacelab.css"
+# CSS_THEME = "/static/appbuilder/css/themes/united.css"
+# CSS_THEME = "/static/appbuilder/css/themes/yeti.css"
 
 try:
     from panoramix_config import *
diff --git a/panoramix/templates/panoramix/base.html b/panoramix/templates/panoramix/base.html
index 63457278eecac..8081d92e142f1 100644
--- a/panoramix/templates/panoramix/base.html
+++ b/panoramix/templates/panoramix/base.html
@@ -3,5 +3,8 @@
 {% block head_css %}
 {{super()}}
   <link rel="stylesheet" type="text/css" href="/static/assets/stylesheets/panoramix.css" />
-  <link rel="stylesheet" type="text/css" href="/static/assets/stylesheets/themes/bootswatch.paper.min.css" />
+  {% set CSS_THEME = appbuilder.get_app.config.get("CSS_THEME") %}
+  {% if CSS_THEME %}
+    <link rel="stylesheet" type="text/css" href="{{ CSS_THEME }}" />
+  {% endif %}
 {% endblock %}
diff --git a/panoramix/templates/panoramix/basic.html b/panoramix/templates/panoramix/basic.html
index cc587efcc3f43..7f21cfcdae80e 100644
--- a/panoramix/templates/panoramix/basic.html
+++ b/panoramix/templates/panoramix/basic.html
@@ -12,8 +12,10 @@
         <link rel="stylesheet" type="text/css" href="/static/assets/node_modules/select2/select2.css" />
         <link rel="stylesheet" type="text/css" href="/static/assets/node_modules/select2/select2-bootstrap.css" />
         <link rel="stylesheet" type="text/css" href="/static/assets/stylesheets/panoramix.css" />
-        <!-- Replace with custom bootstrap theme -->
-        <link rel="stylesheet" type="text/css" href="/static/assets/stylesheets/themes/bootswatch.paper.min.css" />
+        {% set CSS_THEME = appbuilder.get_app.config.get("CSS_THEME") %}
+        {% if CSS_THEME %}
+          <link rel="stylesheet" type="text/css" href="{{ CSS_THEME }}" />
+        {% endif %}
     {% endblock %}
     {% block head_js %}{% endblock %}
   </head>