diff --git a/sapl-frontend/package.json b/sapl-frontend/package.json
index 9c22f9d2e..53d9af4cc 100644
--- a/sapl-frontend/package.json
+++ b/sapl-frontend/package.json
@@ -13,13 +13,12 @@
     "dotenv": "^6.2.0",
     "jquery": "^3.3.1",
     "popper.js": "^1.14.6",
+    "sapl-oficial-theme": "../../sapl-oficial-theme",
     "vue": "^2.5.21",
     "vue-router": "^3.0.1",
     "vuex": "^3.0.1",
     "webpack": "^4.28.4",
-    "webpack-bundle-tracker": "^0.4.2-beta",
-
-    "sapl-oficial-theme": "../../sapl-oficial-theme"
+    "webpack-bundle-tracker": "^0.4.2-beta"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^3.3.0",
@@ -27,10 +26,10 @@
     "@vue/cli-service": "^3.3.0",
     "@vue/eslint-config-prettier": "^4.0.1",
     "babel-eslint": "^10.0.1",
+    "css-loader": "^2.1.0",
     "eslint": "^5.8.0",
     "eslint-plugin-vue": "^5.0.0",
     "node-sass": "^4.9.0",
-    "css-loader": "^2.1.0",
     "sass-loader": "^7.0.1",
     "vue-template-compiler": "^2.5.21"
   }
diff --git a/sapl-frontend/public/index.html b/sapl-frontend/public/index.html
index b50b16df5..adcecb333 100644
--- a/sapl-frontend/public/index.html
+++ b/sapl-frontend/public/index.html
@@ -13,5 +13,7 @@
     </noscript>
     <div id="app"></div>
     <!-- built files will be auto injected -->
+        <img src="icon_comissoes">
+
   </body>
 </html>
diff --git a/sapl-frontend/src/assets/img/arrow.png b/sapl-frontend/src/assets/img/arrow.png
deleted file mode 100644
index 1f1a6e5a1..000000000
Binary files a/sapl-frontend/src/assets/img/arrow.png and /dev/null differ
diff --git a/sapl-frontend/src/assets/img/authenticated.png b/sapl-frontend/src/assets/img/authenticated.png
deleted file mode 100644
index 872718490..000000000
Binary files a/sapl-frontend/src/assets/img/authenticated.png and /dev/null differ
diff --git a/sapl-frontend/src/assets/img/avatar.png b/sapl-frontend/src/assets/img/avatar.png
deleted file mode 100644
index 959c168a5..000000000
Binary files a/sapl-frontend/src/assets/img/avatar.png and /dev/null differ
diff --git a/sapl-frontend/src/assets/img/beta.png b/sapl-frontend/src/assets/img/beta.png
deleted file mode 100644
index fe23d0e6d..000000000
Binary files a/sapl-frontend/src/assets/img/beta.png and /dev/null differ
diff --git a/sapl-frontend/src/assets/img/brasao_transp.gif b/sapl-frontend/src/assets/img/brasao_transp.gif
deleted file mode 100644
index 2d9ac82c6..000000000
Binary files a/sapl-frontend/src/assets/img/brasao_transp.gif and /dev/null differ
diff --git a/sapl-frontend/src/assets/img/down_arrow_select.jpg b/sapl-frontend/src/assets/img/down_arrow_select.jpg
deleted file mode 100644
index a3a75352d..000000000
Binary files a/sapl-frontend/src/assets/img/down_arrow_select.jpg and /dev/null differ
diff --git a/sapl-frontend/src/assets/img/etiqueta.png b/sapl-frontend/src/assets/img/etiqueta.png
deleted file mode 100644
index 28db5a89e..000000000
Binary files a/sapl-frontend/src/assets/img/etiqueta.png and /dev/null differ
diff --git a/sapl-frontend/src/assets/img/favicon.ico b/sapl-frontend/src/assets/img/favicon.ico
deleted file mode 100644
index b81629808..000000000
Binary files a/sapl-frontend/src/assets/img/favicon.ico and /dev/null differ
diff --git a/sapl-frontend/src/assets/img/file.png b/sapl-frontend/src/assets/img/file.png
deleted file mode 100644
index 9bcae6c88..000000000
Binary files a/sapl-frontend/src/assets/img/file.png and /dev/null differ
diff --git a/sapl-frontend/src/assets/img/hand-note.png b/sapl-frontend/src/assets/img/hand-note.png
deleted file mode 100644
index 43c757bf1..000000000
Binary files a/sapl-frontend/src/assets/img/hand-note.png and /dev/null differ
diff --git a/sapl-frontend/src/assets/img/icon_comissoes.png b/sapl-frontend/src/assets/img/icon_comissoes.png
deleted file mode 100644
index 8ec70e7e1..000000000
Binary files a/sapl-frontend/src/assets/img/icon_comissoes.png and /dev/null differ
diff --git a/sapl-frontend/src/assets/img/icon_delete_white.png b/sapl-frontend/src/assets/img/icon_delete_white.png
deleted file mode 100644
index f06892bff..000000000
Binary files a/sapl-frontend/src/assets/img/icon_delete_white.png and /dev/null differ
diff --git a/sapl-frontend/src/assets/img/icon_materia_legislativa.png b/sapl-frontend/src/assets/img/icon_materia_legislativa.png
deleted file mode 100644
index 18cdd81f9..000000000
Binary files a/sapl-frontend/src/assets/img/icon_materia_legislativa.png and /dev/null differ
diff --git a/sapl-frontend/src/assets/img/icon_mesa_diretora.png b/sapl-frontend/src/assets/img/icon_mesa_diretora.png
deleted file mode 100644
index 12a1b9f13..000000000
Binary files a/sapl-frontend/src/assets/img/icon_mesa_diretora.png and /dev/null differ
diff --git a/sapl-frontend/src/assets/img/icon_normas_juridicas.png b/sapl-frontend/src/assets/img/icon_normas_juridicas.png
deleted file mode 100644
index 147681ef8..000000000
Binary files a/sapl-frontend/src/assets/img/icon_normas_juridicas.png and /dev/null differ
diff --git a/sapl-frontend/src/assets/img/icon_parlamentares.png b/sapl-frontend/src/assets/img/icon_parlamentares.png
deleted file mode 100644
index fe9f91ac7..000000000
Binary files a/sapl-frontend/src/assets/img/icon_parlamentares.png and /dev/null differ
diff --git a/sapl-frontend/src/assets/img/icon_pautas.png b/sapl-frontend/src/assets/img/icon_pautas.png
deleted file mode 100644
index 8d554f4e4..000000000
Binary files a/sapl-frontend/src/assets/img/icon_pautas.png and /dev/null differ
diff --git a/sapl-frontend/src/assets/img/icon_plenarias.png b/sapl-frontend/src/assets/img/icon_plenarias.png
deleted file mode 100644
index b5fdaa97d..000000000
Binary files a/sapl-frontend/src/assets/img/icon_plenarias.png and /dev/null differ
diff --git a/sapl-frontend/src/assets/img/icon_relatorios.png b/sapl-frontend/src/assets/img/icon_relatorios.png
deleted file mode 100644
index 3bd71c94d..000000000
Binary files a/sapl-frontend/src/assets/img/icon_relatorios.png and /dev/null differ
diff --git a/sapl-frontend/src/assets/img/icon_save_white.png b/sapl-frontend/src/assets/img/icon_save_white.png
deleted file mode 100644
index 8f9ccbbf1..000000000
Binary files a/sapl-frontend/src/assets/img/icon_save_white.png and /dev/null differ
diff --git a/sapl-frontend/src/assets/img/lexml.gif b/sapl-frontend/src/assets/img/lexml.gif
deleted file mode 100644
index 193f9cb55..000000000
Binary files a/sapl-frontend/src/assets/img/lexml.gif and /dev/null differ
diff --git a/sapl-frontend/src/assets/img/logo.png b/sapl-frontend/src/assets/img/logo.png
deleted file mode 100644
index cc8619f2f..000000000
Binary files a/sapl-frontend/src/assets/img/logo.png and /dev/null differ
diff --git a/sapl-frontend/src/assets/img/logo_cc.png b/sapl-frontend/src/assets/img/logo_cc.png
deleted file mode 100644
index 7301d05b1..000000000
Binary files a/sapl-frontend/src/assets/img/logo_cc.png and /dev/null differ
diff --git a/sapl-frontend/src/assets/img/logo_interlegis.png b/sapl-frontend/src/assets/img/logo_interlegis.png
deleted file mode 100644
index 19591933c..000000000
Binary files a/sapl-frontend/src/assets/img/logo_interlegis.png and /dev/null differ
diff --git a/sapl-frontend/src/assets/img/manual.png b/sapl-frontend/src/assets/img/manual.png
deleted file mode 100644
index 27a2d87c1..000000000
Binary files a/sapl-frontend/src/assets/img/manual.png and /dev/null differ
diff --git a/sapl-frontend/src/assets/img/pdflogo.png b/sapl-frontend/src/assets/img/pdflogo.png
deleted file mode 100644
index ae28bf428..000000000
Binary files a/sapl-frontend/src/assets/img/pdflogo.png and /dev/null differ
diff --git a/sapl-frontend/src/assets/img/perfil.png b/sapl-frontend/src/assets/img/perfil.png
deleted file mode 100644
index d1c4b77ed..000000000
Binary files a/sapl-frontend/src/assets/img/perfil.png and /dev/null differ
diff --git a/sapl-frontend/src/assets/img/search-gray.png b/sapl-frontend/src/assets/img/search-gray.png
deleted file mode 100644
index 1f1c1c6c9..000000000
Binary files a/sapl-frontend/src/assets/img/search-gray.png and /dev/null differ
diff --git a/sapl-frontend/src/assets/img/search.png b/sapl-frontend/src/assets/img/search.png
deleted file mode 100644
index 442814ed8..000000000
Binary files a/sapl-frontend/src/assets/img/search.png and /dev/null differ
diff --git a/sapl-frontend/src/assets/img/user.png b/sapl-frontend/src/assets/img/user.png
deleted file mode 100644
index e8811bcb4..000000000
Binary files a/sapl-frontend/src/assets/img/user.png and /dev/null differ
diff --git a/sapl-frontend/vue.config.js b/sapl-frontend/vue.config.js
index 69dca7c5c..37baba374 100644
--- a/sapl-frontend/vue.config.js
+++ b/sapl-frontend/vue.config.js
@@ -5,6 +5,8 @@ const BundleTracker = require('webpack-bundle-tracker')
 const dotenv = require('dotenv')
 dotenv.config({ path: '../sapl/.env' })
 
+var THEME_CUSTOM = process.env.THEME_CUSTOM === undefined ? "sapl-oficial-theme" : process.env.THEME_CUSTOM
+
 module.exports = {
   publicPath: 'http://localhost:8080/',
   outputDir: './dist/',
@@ -30,25 +32,29 @@ module.exports = {
       .watchContentBase( true )
       .https(false)
       .headers({ 'Access-Control-Allow-Origin': '\*' })
-      .contentBase( [path.join(__dirname, 'public'), path.join(__dirname, 'src', 'assets')] )
-
+      .contentBase( [
+        path.join(__dirname, 'public'), 
+        path.join(__dirname, 'src', 'assets'),
+        path.join(__dirname, 'node_modules', THEME_CUSTOM, 'public'), 
+      
+      ] )
 
     config.entryPoints.delete('app')
     
-      // then add your own
     config.entry('hellow')
       .add('./src/hellow/main.js')
       .end()
-      
-    config.entry('theme')
-      .add('./src/theme/main.js')
-      .end()
-      
-    config
+
+    /*config
       .plugin('theme')
       .use(webpack.DefinePlugin, [{
-        THEME_CUSTOM: JSON.stringify(process.env.THEME_CUSTOM)
+        THEME_CUSTOM: JSON.stringify(THEME_CUSTOM)
       }])
+      .end()*/
+      
+    config.entry(THEME_CUSTOM)
+      .add(THEME_CUSTOM + '/src/main.js')
       .end()
+      
   }
 }
diff --git a/sapl/context_processors.py b/sapl/context_processors.py
index ad1a33d9b..9f1c72fc7 100644
--- a/sapl/context_processors.py
+++ b/sapl/context_processors.py
@@ -22,3 +22,7 @@ def mail_service_configured(request):
         logger.warning(_('Servidor de email não configurado.'))
         return {'mail_service_configured': False}
     return {'mail_service_configured': True}
+
+
+def THEME_CUSTOM(request):
+    return {"THEME_CUSTOM": settings.THEME_CUSTOM}
diff --git a/sapl/settings.py b/sapl/settings.py
index b1b4c962e..55dbef8bb 100755
--- a/sapl/settings.py
+++ b/sapl/settings.py
@@ -190,6 +190,7 @@ TEMPLATES = [
                 'django.contrib.messages.context_processors.messages',
                 'sapl.context_processors.parliament_info',
                 'sapl.context_processors.mail_service_configured',
+                'sapl.context_processors.THEME_CUSTOM'
             ],
             'debug': DEBUG
         },
@@ -274,7 +275,7 @@ WEBPACK_LOADER = {
         'IGNORE': [r'.+\.hot-update.js', r'.+\.map']
     }
 }
-
+THEME_CUSTOM = config('THEME_CUSTOM', default='sapl-oficial-theme')
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.8/howto/static-files/
 
diff --git a/sapl/templates/base.html b/sapl/templates/base.html
index 282ad7e41..1a77d7d1b 100644
--- a/sapl/templates/base.html
+++ b/sapl/templates/base.html
@@ -30,7 +30,7 @@
                               {# Scripts #}
                               {# modernizr must be in head (see http://modernizr.com/docs/#installing) #}
       {% endcomment %}
-            {% render_bundle 'theme' 'css' %}
+            {% render_bundle THEME_CUSTOM 'css' %}
 
     {% endblock %}
   </head>
@@ -233,7 +233,7 @@
     {% endif %}
 
     {% block foot_js %}
-      {% render_bundle 'theme' 'js' %}
+      {% render_bundle THEME_CUSTOM 'js' %}
 
       {% comment "" %}