diff --git a/index.html b/index.html
index e1c6d92b80..934a8e74a1 100644
--- a/index.html
+++ b/index.html
@@ -28,6 +28,7 @@
 		-->
 		<meta http-equiv="X-UA-Compatible" content="chrome=1">
 		<title>Remix - Solidity IDE</title>
+		<link rel="stylesheet" id="theme-link"/>
 		<link rel="stylesheet" href="assets/css/pygment_trac.css">
 		<link rel="stylesheet" href="assets/css/font-awesome.min.css">
 		<link rel="icon" type="x-icon" href="icon.png">
diff --git a/src/app/components/plugin-manager-component.js b/src/app/components/plugin-manager-component.js
index fce979f919..fcadba7aaa 100644
--- a/src/app/components/plugin-manager-component.js
+++ b/src/app/components/plugin-manager-component.js
@@ -1,8 +1,8 @@
 var yo = require('yo-yo')
 var csjs = require('csjs-inject')
 
-const styleguide = require('../ui/styles-guide/theme-chooser')
-const styles = styleguide.chooser()
+// const styleguide = require('../ui/styles-guide/theme-chooser')
+// const styles = styleguide.chooser()
 
 const EventEmitter = require('events')
 
@@ -120,11 +120,16 @@ class PluginManagerComponent {
     }
 
     ctrBtns = yo`<div id='${mod.profile.name}Activation'>
-        <button onclick=${(event) => { action(event) }} >${this.store.isActive(item) ? 'deactivate' : 'activate'}</button>
+        <button class='btn btn-sm btn-primary' onclick=${(event) => { action(event) }} >${this.store.isActive(item) ? 'deactivate' : 'activate'}</button>
         </div>`
 
+        // <div id='${mod.profile.name}Activation' class="custom-control custom-switch">
+        //   <input type="checkbox" class="custom-control-input" id="customSwitch1">
+        //   <label class="custom-control-label" for="customSwitch1">Toggle this switch element</label>
+        // </div>
+
     return yo`
-    <div id=${mod.profile.name} title="${item}" class=${css.plugin} >
+    <div id=${mod.profile.name} title="${item}" class="card ${css.plugin}" >
       <h3>${displayName}</h3>
       ${mod.profile.description}
       ${ctrBtns}
@@ -160,7 +165,7 @@ module.exports = PluginManagerComponent
 const css = csjs`
   .plugins_settings h2 {
     font-size: 1em;
-    border-bottom: 1px ${styles.appProperties.solidBorderBox_BorderColor} solid;
+    border-bottom: 1px red solid;
     padding: 10px 20px;
     font-size: 10px;
     padding: 10px 20px;
@@ -170,10 +175,8 @@ const css = csjs`
     margin-bottom: 0;
   }
   .plugin {
-    ${styles.rightPanel.compileTab.box_CompileContainer};
     margin: 0;
     margin-bottom: 2%;
-    border-bottom: 1px ${styles.appProperties.solidBorderBox_BorderColor} solid;
     padding: 0px 20px 10px;
   }
   .plugin h3 {
@@ -183,8 +186,6 @@ const css = csjs`
   }
 
   .plugin button {
-    ${styles.rightPanel.settingsTab.button_LoadPlugin};
-    cursor: pointer;
     font-size: 10px;
   }
   .activePlugins {
diff --git a/src/app/ui/styles-guide/theme-chooser.js b/src/app/ui/styles-guide/theme-chooser.js
index fb0e999406..efd2e50cfe 100644
--- a/src/app/ui/styles-guide/theme-chooser.js
+++ b/src/app/ui/styles-guide/theme-chooser.js
@@ -2,34 +2,61 @@ var styleGuideLight = require('./style-guide')
 var styleGuideDark = require('./styleGuideDark')
 var styleGuideClean = require('./styleGuideClean')
 var Storage = require('remix-lib').Storage
+
+// Boostrap themes
+// TODO : Put it somewhere else
+const themes = {
+  dark: 'https://bootstrap.themes.guide/darkster/theme.min.css',
+  light: 'https://bootstrap.themes.guide/herbie/theme.min.css',
+  clean: 'https://bootstrap.themes.guide/signal/theme.min.css'
+}
 module.exports = {
 
   chooser: function () {
     var themeStorage = new Storage('style:')
     if (themeStorage.exists('theme')) {
       if (themeStorage.get('theme') === 'dark') {
+        document.getElementById('theme-link').setAttribute('href', themes['dark'])
         return styleGuideDark()
       } else if (themeStorage.get('theme') === 'clean') {
+        document.getElementById('theme-link').setAttribute('href', themes['clean'])
         return styleGuideClean()
       } else {
+        document.getElementById('theme-link').setAttribute('href', themes['light'])
         return styleGuideLight()
       }
     } else {
+      document.getElementById('theme-link').setAttribute('href', themes['light'])
       return styleGuideLight()
     }
   },
 
   switchTheme: function (theme) {
     var themeStorage = new Storage('style:')
+    console.log(document)
     themeStorage.set('theme', theme)
-    if (theme === 'dark') {
-      return styleGuideDark()
-    } else if (theme === 'light') {
-      return styleGuideLight()
-    } else if (theme === 'clean') {
-      return styleGuideClean()
-    } else {
-      return styleGuideLight()
-    }
+    // if (theme === 'dark') {
+    //   return styleGuideDark()
+    // } else if (theme === 'light') {
+    //   return styleGuideLight()
+    // } else if (theme === 'clean') {
+    //   return styleGuideClean()
+    // } else {
+    //   return styleGuideLight()
+    // }
+    // // Boostrap themes
+    // // TODO : Put it somewhere else
+    // const themes = {
+    //   dark: 'https://bootstrap.themes.guide/darkster/theme.min.css',
+    //   light: 'https://bootstrap.themes.guide/herbie/theme.min.css',
+    //   clean: 'https://bootstrap.themes.guide/signal/theme.min.css'
+    // }
+
+    // if (themes[theme]) {
+    //   document.getElementById('theme-link').setAttribute('href', themes[theme])
+    // } 
+    // else {
+    //   document.getElementById('theme-link').setProperty('href', themes['light'])
+    // }
   }
 }