diff --git a/src/theme.scss b/src/theme.scss
index 3385d41f0..f6e4eeda7 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -143,9 +143,6 @@ html, body {
     box-shadow:         0px 2px 5px rgba(0, 0, 0, 0.1);
 }
 
-.highlight {
-}
-
 .highlight:hover {
     background-color: rgba(0, 0, 0, 0.1) !important;
 }
@@ -762,97 +759,6 @@ footer {
     cursor: default;
 }
 
-
-// ----------------------------
-// Upgrade
-// ----------------------------
-
-.region-select-map {
-    width: 600px;
-    height: 300px;
-    display: table;
-    margin: auto;
-    cursor: pointer;
-}
-
-.region-selected {
-    opacity: 1 !important;
-}
-
-.region-select {
-    display: inline-block;
-    float: left;
-    opacity: 0.5;
-    height: 300px;
-    transition: all 250ms;
-}
-
-.region-select:hover {
-    opacity: 1;
-}
-
-.region-pin {
-    display: block;
-    position: relative;
-    top: 0;
-    opacity: 0;
-    transition: all 250ms cubic-bezier(0.430, 0.950, 0.810, 1.280);
-}
-
-.region-pin-left {
-    left: 27px;
-}
-
-.region-pin-right {
-    left: -95px;
-}
-
-.region-pin-selected-left {
-    top: 95px;
-    opacity: 1;
-}
-
-.region-pin-selected-right {
-    top: 73px;
-    opacity: 1;
-}
-
-.cloudron-model-list {
-    display: table;
-    width: 100%;
-}
-
-.cloudron-model-item {
-    display: table-cell;
-    padding: 10px;
-    margin: auto;
-    vertical-align: bottom;
-}
-
-.cloudron-model-item-content {
-    display: table-cell;
-    width: 200px;
-    transition: all 250ms;
-    transform: scale(0.95);
-    cursor: pointer;
-    margin: auto;
-    padding: 10px;
-    border-radius: 5px;
-    background-color: rgb(177, 177, 177);
-    color: white;
-    vertical-align: bottom;
-}
-
-.cloudron-model-item-content:hover {
-    transform: scale(1);
-}
-
-.cloudron-model-item-content:hover h4,
-.cloudron-model-item-content:hover h5  {
-    color: white;
-    transition: all 250ms;
-}
-
 // ----------------------------
 // Setup classes
 // ----------------------------
@@ -889,10 +795,10 @@ footer {
     text-align: center;
 }
 
-
 // ----------------------------
 // Error and status page classes
 // ----------------------------
+
 .status-page {
     background-color: white;
     padding: 0;
@@ -1106,7 +1012,6 @@ footer {
 
 .tag-input-container {
     input {
-        display: inline-block;
         float: left;
         height: 18px;
         padding: 0px;
@@ -1125,7 +1030,6 @@ footer {
         line-height: 12px;
         font-size: 11px;
         background-color: #e3eaf6;
-        display: inline-block;
         float: left;
         border-radius: 2px;
         margin: 2px 5px 2px 0px;