diff --git a/misc/theme-rebellion/Makefile b/misc/theme-rebellion/Makefile
index 091c78cfd..40cb4b440 100644
--- a/misc/theme-rebellion/Makefile
+++ b/misc/theme-rebellion/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		theme-rebellion
-PLUGIN_VERSION=		1.2
+PLUGIN_VERSION=		1.3
 PLUGIN_COMMENT=		A suitably dark theme
 PLUGIN_MAINTAINER=	team-rebellion@queens-park.com
 
diff --git a/misc/theme-rebellion/src/opnsense/www/themes/rebellion/assets/stylesheets/main.scss b/misc/theme-rebellion/src/opnsense/www/themes/rebellion/assets/stylesheets/main.scss
index dc084b775..27e727576 100644
--- a/misc/theme-rebellion/src/opnsense/www/themes/rebellion/assets/stylesheets/main.scss
+++ b/misc/theme-rebellion/src/opnsense/www/themes/rebellion/assets/stylesheets/main.scss
@@ -944,3 +944,226 @@ div[data-for*="help_for"] {
 [data-state="red"] {
   background-color: #ec6d12;
 }
+#tab_1 #maintabs {
+  border-bottom: 1px solid #565656;
+}
+
+textarea#update_status {
+  color: inherit !important;
+  background-color: none !important;
+  -webkit-box-shadow: none !important;
+  box-shadow: none !important;
+  border: none !important;
+  &:hover {
+    color: inherit !important;
+    background-color: none !important;
+    -webkit-box-shadow: none !important;
+    box-shadow: none !important;
+    border: none !important;
+  }
+}
+
+.fa-toggle-off::before {
+  color: #ec6d12 !important;
+  outline: none !important;
+}
+
+.fa-toggle-on::before {
+  outline: none !important;
+}
+
+.fa-search, .glyphicon-search::before {
+  content: "\e003";
+  color: #FFFFFF !important;
+}
+
+.fa-times-circle::before {
+  content: "\f057";
+  color: #B13116;
+}
+
+.fa-refresh::before {
+  content: "\f021";
+  color: #FFF;
+}
+
+.fa-question-circle::before {
+  content: "\f059";
+  cursor: pointer;
+  color: #ec6d12;
+}
+
+#navigation > .fa-search::before, .fa-refresh::before {
+  color: inherit !important;
+}
+
+#totals .fa-search::before {
+  color: #FFF !important;
+  background-color: #ec6d12;
+  padding: 5px;
+  border-radius: 4px;
+  border: 1px solid #5A5A5A;
+}
+
+.panel-heading h3:hover {
+  color: #FFFFFF;
+  text-decoration: none;
+}
+
+h3 {
+  &:focus {
+    color: #FFFFFF;
+    text-decoration: none;
+  }
+  &:link {
+    color: #FFFFFF;
+    text-decoration: underline;
+  }
+  &:hover, &:focus {
+    color: #ec6d12;
+    text-decoration: underline;
+  }
+}
+
+text {
+  &.nvd3, &.nv-axislabel, &.nv-legend-text {
+    fill: #FFFFFF;
+  }
+}
+
+.nvd3 .nv-axis {
+  fill: #FFFFFF;
+}
+
+.nv-series-0 {
+  stroke-opacity: 1;
+  stroke-width: 1.5;
+  fill-opacity: 0.5;
+  fill: rgb(0, 151, 255) !important;
+  stroke: rgb(0, 151, 255) !important;
+}
+
+.nv-controlsWrap.nvd3-svg circle.nv-legend-symbol {
+  stroke-width: 1 !important;
+  fill: rgb(143, 143, 143) !important;
+  stroke: rgb(143, 143, 143) !important;
+}
+
+.table-condensed.table-hover {
+  border: 1px solid #515151;
+}
+
+ul.TokensContainer {
+  border-radius: 3px;
+  -webkit-transition: border-color ease-in-out 0.1s, box-shadow ease-in-out 0.1s;
+  -o-transition: border-color ease-in-out 0.1s, box-shadow ease-in-out 0.1s;
+  transition: border-color ease-in-out 0.1s, box-shadow ease-in-out 0.1s;
+  li.Token {
+    color: #FFFFFF !important;
+  }
+}
+
+div.Tokenize ul {
+  &.TokensContainer {
+    li.TokenSearch {
+      color: #FFFFFF !important;
+    }
+    &:hover, &:focus {
+      border-color: #ec6d12 !important;
+      background-color: #2a2a2a !important;
+      -webkit-box-shadow: inset 0 1px 1px rgb(0, 0, 0), 0 0 8px rgba(0, 0, 0, 0.6);
+      box-shadow: inset 0 1px 1px rgb(0, 0, 0), 0 0 8px rgba(0, 0, 0, 0.6);
+    }
+    border: 1px solid #5a5a5a !important;
+    background-color: #2a2a2a !important;
+    color: #FFFFFF !important;
+  }
+  &.Dropdown {
+    border: 1px solid #5a5a5a !important;
+    background-color: #2a2a2a !important;
+    color: #FFFFFF !important;
+  }
+  &.TokensContainer li {
+    &.Token {
+      background-color: #ce671c !important;
+      border: 1px solid #303030 !important;
+    }
+    &.Placeholder {
+      color: #505050 !important;
+    }
+    &.Token a.Close {
+      color: #FFFFFF !important;
+    }
+  }
+}
+
+.bootgrid-table th {
+  > .column-header-anchor {
+    color: #fff !important;
+    > {
+      .icon, .glyphicon {
+        color: #fff !important;
+      }
+    }
+  }
+  &:hover {
+    background-color: #4b4b4b !important;
+  }
+}
+
+.bootgrid-header .actionBar .btn-group > .btn-group .dropdown-menu, .bootgrid-footer .infoBar .btn-group > .btn-group .dropdown-menu {
+  color: #fff;
+  background-color: #2a2a2a;
+  border-color: #1d1d1d;
+}
+
+.btn-group.bootstrap-select {
+  &.open, &:hover {
+    border-color: #323232 !important;
+    color: #FFFFFF !important;
+    background-color: #2d2d2d !important;
+  }
+}
+
+.bootgrid-table td {
+  &.loading, &.no-results {
+    background: none !important;
+  }
+}
+
+.bootgrid-header .actionBar .btn-group > .btn-group .dropdown-menu .dropdown-item:hover, .bootgrid-footer .infoBar .btn-group > .btn-group .dropdown-menu .dropdown-item:hover, .bootgrid-header .actionBar .btn-group > .btn-group .dropdown-menu .dropdown-item:focus, .bootgrid-footer .infoBar .btn-group > .btn-group .dropdown-menu .dropdown-item:focus {
+  color: #FFF !important;
+  text-decoration: none !important;
+  background-color: #ec6d12 !important;
+}
+
+.bootgrid-header .search .glyphicon, .bootgrid-footer .search .glyphicon, .input-group-addon {
+  top: 0;
+  background-color: #ec6d12 !important;
+  border: 1px solid #ec6d12 !important;
+}
+
+.nvtooltip {
+  background-color: rgb(60, 60, 60) !important;
+  color: rgba(0, 0, 0, 1) !important;
+  border: 1px solid rgb(255, 127, 14) !important;
+}
+
+.glyphicon {
+  &.glyphicon-play.text-muted, &.glyphicon-remove.text-muted, &.glyphicon-remove-sign.text-muted, &.glyphicon-info-sign.text-muted {
+    color: #eac80a !important;
+  }
+}
+
+.fa.fa-play.text-muted::before {
+  color: #eac80a !important;
+}
+
+#system_log-widgets.content-box {
+  border: none;
+}
+
+#chart, #chart_intf_in, #chart_intf_out, #chart_top_ports, #chart_top_sources, #traffic_graph_widget_chart_in, #traffic_graph_widget_chart_out {
+  background-color: #292929;
+  border: 1px solid #515151;
+}
\ No newline at end of file
diff --git a/misc/theme-rebellion/src/opnsense/www/themes/rebellion/assets/stylesheets/tokenize2.scss b/misc/theme-rebellion/src/opnsense/www/themes/rebellion/assets/stylesheets/tokenize2.scss
new file mode 100644
index 000000000..a63376de1
--- /dev/null
+++ b/misc/theme-rebellion/src/opnsense/www/themes/rebellion/assets/stylesheets/tokenize2.scss
@@ -0,0 +1,158 @@
+.tokenize {
+  > .tokens-container {
+    position: relative;
+    list-style: none;
+    padding: 0 0 5px 5px;
+    height: auto;
+    min-height: 34px;
+    cursor: text;
+    background-color: #fff;
+    border: 1px solid #ccc;
+    border-radius: 3px;
+    &.disabled {
+      background-color: #eee;
+      cursor: not-allowed;
+    }
+  }
+  &.focus > .tokens-container {
+    outline: 0;
+    border-color: #66afe9;
+    -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
+    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
+  }
+  > .tokens-container {
+    &.input-sm {
+      padding: 0 0 4px 4px;
+      min-height: 30px;
+    }
+    &.input-lg {
+      padding: 0 0 9px 9px;
+      min-height: 46px;
+    }
+    > {
+      .token {
+        padding: 0 1.2em 0 5px;
+        background-color: #111111;
+        -webkit-border-radius: 2px;
+        -moz-border-radius: 2px;
+        border-radius: 2px;
+        border: 1px solid #cdd5e3;
+        display: inline-block;
+        margin: 5px 5px 0 0;
+        position: relative;
+        vertical-align: middle;
+      }
+      .placeholder, .token-search {
+        border: 1px solid #cdd5e3;
+        display: inline-block;
+        margin: 5px 5px 0 0;
+        position: relative;
+        vertical-align: middle;
+      }
+    }
+  }
+  &.sortable > .tokens-container > .token {
+    cursor: move;
+  }
+  &.single > .tokens-container > .token {
+    display: block;
+    border-color: #fff;
+    background-color: transparent;
+  }
+  &.sortable > .tokens-container > .token.shadow {
+    border-color: #ccc;
+    background-color: #ccc;
+    filter: alpha(opacity = 50);
+    opacity: .2;
+  }
+  > .tokens-container {
+    > {
+      .placeholder, .token-search {
+        padding: 0;
+        border-color: #fff;
+      }
+      .placeholder {
+        color: #ccc;
+      }
+      .token-search > input {
+        padding: 0;
+        margin: 0;
+        line-height: 1em;
+        border: 1px solid #fff;
+        background: transparent;
+        border-left: none;
+        border-right: none;
+        outline: none;
+        width: 100%;
+        &::-ms-clear {
+          display: none;
+        }
+      }
+    }
+    &.input-sm > {
+      .placeholder, .token-search, .token {
+        margin: 4px 4px 0 0;
+      }
+    }
+    &.input-lg > {
+      .placeholder, .token-search, .token {
+        margin: 9px 9px 0 0;
+      }
+    }
+    > .token {
+      &.pending-delete {
+        background-color: #5b72a4;
+        border-color: #425c96;
+        color: #fff;
+        > .dismiss {
+          color: #aaa;
+        }
+      }
+      > .dismiss {
+        position: absolute;
+        right: 5px;
+        color: #a9b9d8;
+        text-decoration: none;
+        cursor: pointer;
+        &:after {
+          content: "×";
+        }
+      }
+    }
+  }
+}
+
+.tokenize-dropdown {
+  position: absolute;
+  display: none;
+  > .dropdown-menu {
+    min-height: 10px;
+    width: 100%;
+    display: block;
+    margin: -1px 0 0 0;
+    visibility: visible;
+    opacity: 1;
+    li {
+      cursor: pointer;
+      > a .tokenize-highlight {
+        font-weight: bold;
+      }
+      &.locked {
+        padding: 3px 20px;
+        color: #333;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow-x: hidden;
+      }
+      > a {
+        text-overflow: ellipsis;
+        overflow-x: hidden;
+      }
+      &:not(.active) a {
+        &:hover, &:focus {
+          background-color: transparent;
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/misc/theme-rebellion/src/opnsense/www/themes/rebellion/build/css/jquery.tokenize.css b/misc/theme-rebellion/src/opnsense/www/themes/rebellion/build/css/jquery.tokenize.css
deleted file mode 100644
index 4bd3d57ce..000000000
--- a/misc/theme-rebellion/src/opnsense/www/themes/rebellion/build/css/jquery.tokenize.css
+++ /dev/null
@@ -1,171 +0,0 @@
-div.TokenizeMeasure,
-div.Tokenize ul li span,
-div.Tokenize ul.TokensContainer li.TokenSearch input {
-    font-family: Arial, Helvetica, sans-serif;
-    font-size: 12px;
-}
-
-div.Tokenize {
-    position: relative;
-    display: inline-block;
-    zoom: 1;
-}
-
-div.Tokenize ul {
-    list-style: none;
-    padding: 0;
-    margin: 0;
-}
-
-div.Tokenize ul li {
-    white-space: nowrap;
-}
-
-div.Tokenize ul.TokensContainer {
-    cursor: text;
-    padding: 0 5px 5px 0;
-    height: auto;
-    min-height: 34px;
-    max-height: 170px;
-    border-radius: 3px;
-    overflow-y: auto;
-    background-color: #111;
-    -webkit-touch-callout: none;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-}
-
-div.Tokenize ul.TokensContainer.Autosize {
-    height: auto;
-}
-
-div.Tokenize.Disabled ul.TokensContainer,
-div.Tokenize.Disabled ul.TokensContainer input {
-    cursor: not-allowed;
-}
-
-div.Tokenize ul.TokensContainer li.Token {
-    border: 1px solid #ccd5e3;
-    background-color: #911212;
-    padding: 0 5px;
-    line-height: 18px;
-}
-
-div.Tokenize ul.TokensContainer.ui-sortable:not(.ui-sortable-disabled) li.Token {
-    cursor: move;
-}
-
-div.Tokenize ul.TokensContainer li.Token.MovingShadow  {
-    border: 1px solid #fcefa1;
-    background-color: #fbf9ee;
-}
-
-div.Tokenize ul.TokensContainer li.Token.PendingDelete {
-    opacity : 0.5;
-    -moz-opacity : 0.5;
-    -ms-filter: "alpha(opacity=50)";
-    filter : alpha(opacity=50);
-}
-
-div.Tokenize ul.TokensContainer li.Token,
-div.Tokenize ul.TokensContainer li.TokenSearch {
-    margin: 5px 0 0 5px;
-    height: 18px;
-    float: left;
-}
-
-div.Tokenize ul.TokensContainer li.TokenSearch input {
-    margin: 0;
-    padding: 1px 0;
-    background-color: transparent;
-    line-height: 18px;
-    border: none;
-    outline: none;
-}
-
-div.Tokenize ul.TokensContainer li.Placeholder {
-    color: #ddd;
-    position: absolute;
-    line-height: 20px;
-    padding: 5px 0 0 5px;
-    display: none;
-}
-
-div.Tokenize ul.TokensContainer,
-div.Tokenize ul.Dropdown {
-    border: 1px solid #ccc;
-}
-
-div.Tokenize ul.TokensContainer li.Token a.Close {
-    font-family: Arial, Helvetica, sans-serif !important;
-    font-size: 16px !important;
-    line-height: 18px;
-    float: right;
-    margin: 1px 0 0 5px;
-    padding: 0;
-    cursor: pointer;
-    color: #a6b4ce;
-}
-
-div.Tokenize.Disabled ul.TokensContainer li.Token a.Close {
-    display: none;
-}
-
-div.Tokenize ul.TokensContainer li.Token a.Close:hover {
-    background: transparent;
-    text-decoration: none;
-}
-
-div.Tokenize ul.Dropdown {
-    -webkit-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    -ms-box-sizing: border-box;
-    box-sizing: border-box;
-
-    display: none;
-    width: 100%;
-    padding: 5px 0;
-    margin: -1px 0 0 0;
-    position: absolute;
-    background-color: DimGrey;
-    overflow-y: auto;
-
-    -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-    -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-    -o-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-    box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-
-    -webkit-background-clip: padding-box;
-    -moz-background-clip: padding;
-    background-clip: padding-box;
-
-    -webkit-border-radius: 0 0 6px 6px;
-    -moz-border-radius: 0 0 6px 6px;
-    border-radius: 0 0 6px 6px;
-
-    z-index: 20;
-
-    height: auto;
-    overflow-x: hidden;
-}
-
-div.Tokenize ul.Dropdown li {
-    padding: 5px 20px;
-    overflow: hidden;
-    cursor: pointer;
-}
-
-div.Tokenize ul.Dropdown li.Hover {
-    color: white;
-    text-decoration: none;
-    background-color: #0081c2;
-    background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
-    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
-    background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
-    background-image: -o-linear-gradient(top, #0088cc, #0077b3);
-    background-image: linear-gradient(to bottom, #0088cc, #0077b3);
-    background-repeat: repeat-x;
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
-}
diff --git a/misc/theme-rebellion/src/opnsense/www/themes/rebellion/build/css/main.css b/misc/theme-rebellion/src/opnsense/www/themes/rebellion/build/css/main.css
index 4a5b84bfc..e7f2f7c1a 100644
--- a/misc/theme-rebellion/src/opnsense/www/themes/rebellion/build/css/main.css
+++ b/misc/theme-rebellion/src/opnsense/www/themes/rebellion/build/css/main.css
@@ -7645,3 +7645,209 @@ div[data-for*=help_for] {
 [data-state=red] {
   background-color: #ec6d12;
 }
+
+#tab_1 #maintabs {
+  border-bottom: 1px solid #565656;
+}
+
+textarea#update_status {
+  color: inherit !important;
+  background-color: none !important;
+  -webkit-box-shadow: none !important;
+  box-shadow: none !important;
+  border: none !important;
+}
+textarea#update_status:hover {
+  color: inherit !important;
+  background-color: none !important;
+  -webkit-box-shadow: none !important;
+  box-shadow: none !important;
+  border: none !important;
+}
+
+.fa-toggle-off::before {
+  color: #ec6d12 !important;
+  outline: none !important;
+}
+
+.fa-toggle-on::before {
+  outline: none !important;
+}
+
+.fa-search, .glyphicon-search::before {
+  content: "";
+  color: #FFFFFF !important;
+}
+
+.fa-times-circle::before {
+  content: "";
+  color: #B13116;
+}
+
+.fa-refresh::before {
+  content: "";
+  color: #FFF;
+}
+
+.fa-question-circle::before {
+  content: "";
+  cursor: pointer;
+  color: #ec6d12;
+}
+
+#navigation > .fa-search::before, .fa-refresh::before {
+  color: inherit !important;
+}
+
+#totals .fa-search::before {
+  color: #FFF !important;
+  background-color: #ec6d12;
+  padding: 5px;
+  border-radius: 4px;
+  border: 1px solid #5A5A5A;
+}
+
+.panel-heading h3:hover {
+  color: #FFFFFF;
+  text-decoration: none;
+}
+
+h3:focus {
+  color: #FFFFFF;
+  text-decoration: none;
+}
+h3:link {
+  color: #FFFFFF;
+  text-decoration: underline;
+}
+h3:hover, h3:focus {
+  color: #ec6d12;
+  text-decoration: underline;
+}
+
+text.nvd3, text.nv-axislabel, text.nv-legend-text {
+  fill: #FFFFFF;
+}
+
+.nvd3 .nv-axis {
+  fill: #FFFFFF;
+}
+
+.nv-series-0 {
+  stroke-opacity: 1;
+  stroke-width: 1.5;
+  fill-opacity: 0.5;
+  fill: #0097ff !important;
+  stroke: #0097ff !important;
+}
+
+.nv-controlsWrap.nvd3-svg circle.nv-legend-symbol {
+  stroke-width: 1 !important;
+  fill: #8f8f8f !important;
+  stroke: #8f8f8f !important;
+}
+
+.table-condensed.table-hover {
+  border: 1px solid #515151;
+}
+
+ul.TokensContainer {
+  border-radius: 3px;
+  -webkit-transition: border-color ease-in-out 0.1s, box-shadow ease-in-out 0.1s;
+  -o-transition: border-color ease-in-out 0.1s, box-shadow ease-in-out 0.1s;
+  transition: border-color ease-in-out 0.1s, box-shadow ease-in-out 0.1s;
+}
+ul.TokensContainer li.Token {
+  color: #FFFFFF !important;
+}
+
+div.Tokenize ul.TokensContainer {
+  border: 1px solid #5a5a5a !important;
+  background-color: #2a2a2a !important;
+  color: #FFFFFF !important;
+}
+div.Tokenize ul.TokensContainer li.TokenSearch {
+  color: #FFFFFF !important;
+}
+div.Tokenize ul.TokensContainer:hover, div.Tokenize ul.TokensContainer:focus {
+  border-color: #ec6d12 !important;
+  background-color: #2a2a2a !important;
+  -webkit-box-shadow: inset 0 1px 1px black, 0 0 8px rgba(0, 0, 0, 0.6);
+  box-shadow: inset 0 1px 1px black, 0 0 8px rgba(0, 0, 0, 0.6);
+}
+div.Tokenize ul.Dropdown {
+  border: 1px solid #5a5a5a !important;
+  background-color: #2a2a2a !important;
+  color: #FFFFFF !important;
+}
+div.Tokenize ul.TokensContainer li.Token {
+  background-color: #ce671c !important;
+  border: 1px solid #303030 !important;
+}
+div.Tokenize ul.TokensContainer li.Placeholder {
+  color: #505050 !important;
+}
+div.Tokenize ul.TokensContainer li.Token a.Close {
+  color: #FFFFFF !important;
+}
+
+.bootgrid-table th > .column-header-anchor {
+  color: #fff !important;
+}
+.bootgrid-table th > .column-header-anchor > .icon, .bootgrid-table th > .column-header-anchor > .glyphicon {
+  color: #fff !important;
+}
+.bootgrid-table th:hover {
+  background-color: #4b4b4b !important;
+}
+
+.bootgrid-header .actionBar .btn-group > .btn-group .dropdown-menu, .bootgrid-footer .infoBar .btn-group > .btn-group .dropdown-menu {
+  color: #fff;
+  background-color: #2a2a2a;
+  border-color: #1d1d1d;
+}
+
+.btn-group.bootstrap-select.open, .btn-group.bootstrap-select:hover {
+  border-color: #323232 !important;
+  color: #FFFFFF !important;
+  background-color: #2d2d2d !important;
+}
+
+.bootgrid-table td.loading, .bootgrid-table td.no-results {
+  background: none !important;
+}
+
+.bootgrid-header .actionBar .btn-group > .btn-group .dropdown-menu .dropdown-item:hover, .bootgrid-footer .infoBar .btn-group > .btn-group .dropdown-menu .dropdown-item:hover, .bootgrid-header .actionBar .btn-group > .btn-group .dropdown-menu .dropdown-item:focus, .bootgrid-footer .infoBar .btn-group > .btn-group .dropdown-menu .dropdown-item:focus {
+  color: #FFF !important;
+  text-decoration: none !important;
+  background-color: #ec6d12 !important;
+}
+
+.bootgrid-header .search .glyphicon, .bootgrid-footer .search .glyphicon, .input-group-addon {
+  top: 0;
+  background-color: #ec6d12 !important;
+  border: 1px solid #ec6d12 !important;
+}
+
+.nvtooltip {
+  background-color: #3c3c3c !important;
+  color: black !important;
+  border: 1px solid #ff7f0e !important;
+}
+
+.glyphicon.glyphicon-play.text-muted, .glyphicon.glyphicon-remove.text-muted, .glyphicon.glyphicon-remove-sign.text-muted, .glyphicon.glyphicon-info-sign.text-muted {
+  color: #eac80a !important;
+}
+
+.fa.fa-play.text-muted::before {
+  color: #eac80a !important;
+}
+
+#system_log-widgets.content-box {
+  border: none;
+}
+
+#chart, #chart_intf_in, #chart_intf_out, #chart_top_ports, #chart_top_sources, #traffic_graph_widget_chart_in, #traffic_graph_widget_chart_out {
+  background-color: #292929;
+  border: 1px solid #515151;
+}
diff --git a/misc/theme-rebellion/src/opnsense/www/themes/rebellion/build/css/tokenize2.css b/misc/theme-rebellion/src/opnsense/www/themes/rebellion/build/css/tokenize2.css
new file mode 100644
index 000000000..28d017cbe
--- /dev/null
+++ b/misc/theme-rebellion/src/opnsense/www/themes/rebellion/build/css/tokenize2.css
@@ -0,0 +1,141 @@
+@charset "UTF-8";
+.tokenize > .tokens-container {
+  position: relative;
+  list-style: none;
+  padding: 0 0 5px 5px;
+  height: auto;
+  min-height: 34px;
+  cursor: text;
+  background-color: #fff;
+  border: 1px solid #ccc;
+  border-radius: 3px;
+}
+.tokenize > .tokens-container.disabled {
+  background-color: #eee;
+  cursor: not-allowed;
+}
+.tokenize.focus > .tokens-container {
+  outline: 0;
+  border-color: #66afe9;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
+}
+.tokenize > .tokens-container.input-sm {
+  padding: 0 0 4px 4px;
+  min-height: 30px;
+}
+.tokenize > .tokens-container.input-lg {
+  padding: 0 0 9px 9px;
+  min-height: 46px;
+}
+.tokenize > .tokens-container > .token {
+  padding: 0 1.2em 0 5px;
+  background-color: #111111;
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  border: 1px solid #cdd5e3;
+  display: inline-block;
+  margin: 5px 5px 0 0;
+  position: relative;
+  vertical-align: middle;
+}
+.tokenize > .tokens-container > .placeholder, .tokenize > .tokens-container > .token-search {
+  border: 1px solid #cdd5e3;
+  display: inline-block;
+  margin: 5px 5px 0 0;
+  position: relative;
+  vertical-align: middle;
+}
+.tokenize.sortable > .tokens-container > .token {
+  cursor: move;
+}
+.tokenize.single > .tokens-container > .token {
+  display: block;
+  border-color: #fff;
+  background-color: transparent;
+}
+.tokenize.sortable > .tokens-container > .token.shadow {
+  border-color: #ccc;
+  background-color: #ccc;
+  filter: alpha(opacity=50);
+  opacity: 0.2;
+}
+.tokenize > .tokens-container > .placeholder, .tokenize > .tokens-container > .token-search {
+  padding: 0;
+  border-color: #fff;
+}
+.tokenize > .tokens-container > .placeholder {
+  color: #ccc;
+}
+.tokenize > .tokens-container > .token-search > input {
+  padding: 0;
+  margin: 0;
+  line-height: 1em;
+  border: 1px solid #fff;
+  background: transparent;
+  border-left: none;
+  border-right: none;
+  outline: none;
+  width: 100%;
+}
+.tokenize > .tokens-container > .token-search > input::-ms-clear {
+  display: none;
+}
+.tokenize > .tokens-container.input-sm > .placeholder, .tokenize > .tokens-container.input-sm > .token-search, .tokenize > .tokens-container.input-sm > .token {
+  margin: 4px 4px 0 0;
+}
+.tokenize > .tokens-container.input-lg > .placeholder, .tokenize > .tokens-container.input-lg > .token-search, .tokenize > .tokens-container.input-lg > .token {
+  margin: 9px 9px 0 0;
+}
+.tokenize > .tokens-container > .token.pending-delete {
+  background-color: #5b72a4;
+  border-color: #425c96;
+  color: #fff;
+}
+.tokenize > .tokens-container > .token.pending-delete > .dismiss {
+  color: #aaa;
+}
+.tokenize > .tokens-container > .token > .dismiss {
+  position: absolute;
+  right: 5px;
+  color: #a9b9d8;
+  text-decoration: none;
+  cursor: pointer;
+}
+.tokenize > .tokens-container > .token > .dismiss:after {
+  content: "×";
+}
+
+.tokenize-dropdown {
+  position: absolute;
+  display: none;
+}
+.tokenize-dropdown > .dropdown-menu {
+  min-height: 10px;
+  width: 100%;
+  display: block;
+  margin: -1px 0 0 0;
+  visibility: visible;
+  opacity: 1;
+}
+.tokenize-dropdown > .dropdown-menu li {
+  cursor: pointer;
+}
+.tokenize-dropdown > .dropdown-menu li > a .tokenize-highlight {
+  font-weight: bold;
+}
+.tokenize-dropdown > .dropdown-menu li.locked {
+  padding: 3px 20px;
+  color: #333;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow-x: hidden;
+}
+.tokenize-dropdown > .dropdown-menu li > a {
+  text-overflow: ellipsis;
+  overflow-x: hidden;
+}
+.tokenize-dropdown > .dropdown-menu li:not(.active) a:hover, .tokenize-dropdown > .dropdown-menu li:not(.active) a:focus {
+  background-color: transparent;
+}