diff --git a/Themes/v2.0/blue_gold.css b/Themes/blue_gold.css
similarity index 100%
rename from Themes/v2.0/blue_gold.css
rename to Themes/blue_gold.css
diff --git a/Themes/v2.0/deutera_one.css b/Themes/deutera_one.css
similarity index 100%
rename from Themes/v2.0/deutera_one.css
rename to Themes/deutera_one.css
diff --git a/Themes/v2.0/green_lume.css b/Themes/green_lume.css
similarity index 100%
rename from Themes/v2.0/green_lume.css
rename to Themes/green_lume.css
diff --git a/Themes/v1.16/b_transition.css b/Themes/v1.16/b_transition.css
deleted file mode 100644
index 961cfda..0000000
--- a/Themes/v1.16/b_transition.css
+++ /dev/null
@@ -1,141 +0,0 @@
-*:not(.fa) {
-    font-family: ‘Trebuchet MS’, Helvetica, sans-serif;
-}
-body {
-    font-size: 0.8rem;
-}
-
-/* ProtonMail logo
-   -Useful for clear themes.
-*/
-
-#sidebar a img {
-    background: #0D5075;
-    padding: 0.5rem;
-    border-radius: 5px;
-}
-
-/* Main Backgrounds */
-#sidebar, #main footer .wrap, body #mainHeader, footer .wrap, #sidebar .storage, #footer, body.outside #mainHeader {
-    background: #E6E6E6;
-}
-/* Header Search Bar */
-#mainHeader .search.dark input {
-    background: #E6E6E6;
-    color: #0D5075;
-}
-#mainHeader .search input {
-    border-radius: 0.3rem;
-    border: 2px double #0D5075;
-}
-
-p.hello {
-    opacity:0.6;
-}
-/* Links */
-#mainHeader .dark button, #mainHeader p, #mainHeader a, 
-#sidebar ul li a, #sidebar ul li a span, #sidebar ul.menu li a.active,
-#sidebar ul.menu li a.active span, .sizebar, #footer .wrap a, #listing-actions-buttons ul li a:hover, 
-#sidebar ul.menu li a.active, ul.menu li a.active span, #mainHeader a span {
-    color: #0D5075 !important;
-}
-#mainHeader .dark button:hover, #mainHeader .dark button:hover .fa,
-#compose_button span, #compose_button strong, #mainHeader a:active, 
-#mainHeader a:hover, #mainHeader a:hover, #mainHeader li a.active span, 
-#mainHeader li a:hover span, #sidebar,#sidebar ul.menu li a:hover span, 
-#sidebar ul.menu li a.active:hover, #footer .wrap a:hover, #sidebar ul.menu li a:hover {
-    color: #ED1C24 !important;
-}
-
-/* Sidebar compose button */
-#compose_button strong, #sidebar #compose_button a  span {
-    color: #E6E6E6 !important;
-}
-
-#compose_button a {
-    background: #0D5075;
-}
-
-#compose_button a:active, #compose_button a:hover, .fill {
-    background: #ED1C24;
-}
-
-/* Sidebar Number */
-#sidebar .number, #sidebar .active .number {
-    background: #fff;
-    color: #0D5075;
-}
-
-#sidebar ul.menu li a:hover .number {
-    background: #ED1C24;
-    color: #E6E6E6;
-}
-
-/* Sidebar Active Section */
-#sidebar ul.menu li a.active {
-    background: #B3B3B3;
-}
-
-/*Sidebar Dividers */
-.divider {
-    opacity: 0.3;
-}
-
-/* Footer Text */
-#footer .wrap {
-    color: #1C1C1C;
-}
-/*Mail Commandbar */
-#messages tbody {
-    font-size: 0.8rem !important;
-}
-/* Page Buttons */
-.pure-button.pure-button-primary, body .ui-button.pure-button-primary {
-    background: #0D5075;
-    transition: background .2s ease-in;
-}
-.pure-button.pure-button-primary:focus, .pure-button.pure-button-primary:hover, body .ui-button.pure-button-primary:focus, body .ui-button.pure-button-primary:hover {
-    background: #ED1C24;
-}
-/* Labels */
-#listing .pmlabel {
-    border-radius: 0.2rem;
-    padding: 0.1rem 0.7rem;
-}
-/*Reading Mail*/
-#primaryHeader #titleBar h1 {
-    font-size: 0.9rem;
-}
-#page-m .pmlabel {
-    padding: 0.1rem 1.2rem;
-    padding-left: 0.6rem;
-    border-radius: 0.2rem;
-}
-span.bubble {
-    padding: 0.1rem 0.5rem;
-}
-span.bubble:hover {
-    background: #0D5075 !important;
-    border-color: #0A3D59 !important;
-    color:#E6E6E6 !important;
-}
-#dkim .verified {
-    color:#8CC63F;
-}
-/*Unread*/
-#messages tr.unread td {
-    background: #fff;
-}
-
-#messages tr.unread, #messages tr.unread a, #messages tr.unread td {
-    color: #0A3D59 !important;
-}
-/*Starred Mails*/
-body table#messages tr.starred td {
-    background: rgba(55, 177, 245, 0.14) none repeat scroll 0% 0%;
-}
-/*Responsive Menu Background */
-#mmm {
-    background: #B3B3B3;
-}
-
diff --git a/Themes/v1.16/circus_iii.css b/Themes/v1.16/circus_iii.css
deleted file mode 100644
index e081b69..0000000
--- a/Themes/v1.16/circus_iii.css
+++ /dev/null
@@ -1,132 +0,0 @@
-*:not(.fa) {
-    font-family: ‘Trebuchet MS’, Helvetica, sans-serif;
-}
-body {
-    font-size: 0.8rem;
-}
-
-/* Main Backgrounds */
-#sidebar, #main footer .wrap, body #mainHeader, footer .wrap, #sidebar .storage, #footer, body.outside #mainHeader {
-    background: #2E0927;
-}
-/* Header Search Bar */
-#mainHeader .search.dark input {
-    background: #FF8C00;
-    color: #04756F;
-    font-weight: bold;
-}
-#mainHeader .search input {
-    border-radius: 0.3rem;
-    border: 2px double #FF2D00;
-}
-
-p.hello {
-    opacity:0.6;
-}
-/* Links */
-#mainHeader .dark button, #mainHeader p, #mainHeader a, 
-#sidebar ul li a, #sidebar ul li a span, #sidebar ul.menu li a.active,
-#sidebar ul.menu li a.active span, .sizebar, #footer .wrap a, #listing-actions-buttons ul li a:hover, 
-#sidebar ul.menu li a.active, ul.menu li a.active span, #mainHeader a span {
-    color: #FF8C00 !important;
-}
-#mainHeader .dark button:hover, #mainHeader .dark button:hover .fa,
-#compose_button span, #compose_button strong, #mainHeader a:active, 
-#mainHeader a:hover, #mainHeader a:hover, #mainHeader li a.active span, 
-#mainHeader li a:hover span, #sidebar,#sidebar ul.menu li a:hover span, 
-#sidebar ul.menu li a.active:hover, #footer .wrap a:hover, #sidebar ul.menu li a:hover {
-    color: #FF2D00 !important;
-}
-
-/* Sidebar compose button */
-#compose_button strong, #sidebar #compose_button a  span {
-    color: #FFF !important;
-}
-
-#compose_button a {
-    background: #D90000;
-}
-
-#compose_button a:active, #compose_button a:hover, .fill {
-    background: #04756F;
-}
-
-/* Sidebar Number */
-#sidebar .number, #sidebar .active .number {
-    background: #FF8C00;
-    color: #FF2D00;
-}
-
-#sidebar ul.menu li a:hover .number {
-    background: #FF2D00;
-    color: #FF8C00;
-}
-
-/* Sidebar Active Section */
-#sidebar ul.menu li a.active {
-    background: #04756F;
-}
-
-/*Sidebar Dividers */
-.divider {
-    opacity: 0.2;
-}
-
-/* Footer Text */
-#footer .wrap {
-    color: #fff;
-}
-/*Mail Commandbar */
-#messages tbody {
-    font-size: 0.8rem !important;
-}
-/* Page Buttons */
-.pure-button.pure-button-primary, body .ui-button.pure-button-primary {
-    background: #2E0927;
-    transition: background .2s ease-in;
-}
-.pure-button.pure-button-primary:focus, .pure-button.pure-button-primary:hover, body .ui-button.pure-button-primary:focus, body .ui-button.pure-button-primary:hover {
-    background: #FF2D00;
-}
-/* Labels */
-#listing .pmlabel {
-    border-radius: 0.2rem;
-    padding: 0.1rem 0.7rem;
-}
-/*Reading Mail*/
-#primaryHeader #titleBar h1 {
-    font-size: 0.9rem;
-}
-#page-m .pmlabel {
-    padding: 0.1rem 1.2rem;
-    padding-left: 0.6rem;
-    border-radius: 0.2rem;
-}
-span.bubble {
-    padding: 0.1rem 0.5rem;
-}
-span.bubble:hover {
-    background: #04756F !important;
-    border-color: #03615C !important;
-    color:#FFF !important;
-}
-#dkim .verified {
-    color:#8CC63F;
-}
-/*Unread*/
-#messages tr.unread td {
-    background: #fff;
-}
-
-#messages tr.unread, #messages tr.unread a, #messages tr.unread td {
-    color: #03615C !important;
-}
-/*Starred Mails*/
-body table#messages tr.starred td {
-    background: rgba(255, 140, 0, 0.25) none repeat scroll 0% 0%;
-}
-/*Responsive Menu Background */
-#mmm {
-    background: #2E0927;
-}
-
diff --git a/Themes/v1.16/deuteraone.css b/Themes/v1.16/deuteraone.css
deleted file mode 100644
index d82f53b..0000000
--- a/Themes/v1.16/deuteraone.css
+++ /dev/null
@@ -1,129 +0,0 @@
-*:not(.fa) {
-    font-family: ‘Trebuchet MS’, Helvetica, sans-serif;
-}
-body {
-    font-size: 0.8rem;
-}
-
-/* Main Backgrounds */
-#sidebar, #main footer .wrap, body #mainHeader, footer .wrap, #sidebar .storage, #footer, body.outside #mainHeader {
-    background: #08426b;
-}
-/* Header Search Bar */
-#mainHeader .search.dark input {
-    background: #08426b;
-    color: #fff;
-    font-weight: bold;
-}
-#mainHeader .search input {
-    border-radius: 0.3rem;
-    border: 2px double #fff;
-}
-
-p.hello {
-    opacity:1;
-}
-/* Links */
-#mainHeader .dark button, #mainHeader p, #mainHeader a, 
-#sidebar ul li a, #sidebar ul li a span, #sidebar ul.menu li a.active,
-#sidebar ul.menu li a.active span, .sizebar, #footer .wrap a, #listing-actions-buttons ul li a:hover, 
-#sidebar ul.menu li a.active, ul.menu li a.active span, #mainHeader a span {
-    color: #ffed00 !important;
-}
-#mainHeader .dark button:hover, #mainHeader .dark button:hover .fa,
-#compose_button span, #compose_button strong, #mainHeader a:active, 
-#mainHeader a:hover, #mainHeader a:hover, #mainHeader li a.active span, 
-#mainHeader li a:hover span, #sidebar,#sidebar ul.menu li a:hover span, 
-#sidebar ul.menu li a.active:hover, #footer .wrap a:hover, #sidebar ul.menu li a:hover {
-    color: #fff !important;
-}
-
-/* Sidebar compose button */
-#compose_button strong, #sidebar #compose_button a  span {
-    color: #1c1c1c !important;
-}
-
-#compose_button a {
-    background: #ffed00;
-}
-
-#compose_button a:active, #compose_button a:hover, .fill {
-    background: #fff;
-}
-
-/* Sidebar Number */
-#sidebar .number, #sidebar .active .number {
-    background: #fff;
-    color: #ffed00;
-}
-
-#sidebar ul.menu li a:hover .number {
-    background: #fff;
-    color: #08426b;
-}
-
-/* Sidebar Active Section */
-#sidebar ul.menu li a.active {
-    background: #1c1c1c;
-}
-
-/*Sidebar Dividers */
-.divider {
-    opacity: 0.2;
-}
-
-/* Footer Text */
-#footer .wrap {
-    color: #fff;
-}
-/*Mail Commandbar */
-#messages tbody {
-    font-size: 0.8rem !important;
-}
-/* Page Buttons */
-.pure-button.pure-button-primary, body .ui-button.pure-button-primary {
-    background: #08426b;
-    transition: background .2s ease-in;
-}
-.pure-button.pure-button-primary:focus, .pure-button.pure-button-primary:hover, body .ui-button.pure-button-primary:focus, body .ui-button.pure-button-primary:hover {
-    background: #ffed00;
-}
-/* Labels */
-#listing .pmlabel {
-    border-radius: 0.2rem;
-    padding: 0.1rem 0.7rem;
-}
-/*Reading Mail*/
-#primaryHeader #titleBar h1 {
-    font-size: 0.9rem;
-}
-#page-m .pmlabel {
-    padding: 0.1rem 1.2rem;
-    padding-left: 0.6rem;
-    border-radius: 0.2rem;
-}
-span.bubble {
-    padding: 0.1rem 0.5rem;
-}
-span.bubble:hover {
-    background: #08426b !important;
-    border-color: #004358 !important;
-    color:#FFF !important;
-}
-#dkim .verified {
-    color:#000;
-}
-/*Unread*/
-#messages tr.unread td {
-    background: #fff;
-}
-
-#messages tr.unread, #messages tr.unread a, #messages tr.unread td {
-    color: #000 !important;
-}
-
-/*Responsive Menu Background */
-#mmm {
-    background: #08426b;
-}
-
diff --git a/Themes/v1.16/dusty_petrol.css b/Themes/v1.16/dusty_petrol.css
deleted file mode 100644
index 79779ad..0000000
--- a/Themes/v1.16/dusty_petrol.css
+++ /dev/null
@@ -1,132 +0,0 @@
-*:not(.fa) {
-    font-family: ‘Trebuchet MS’, Helvetica, sans-serif;
-}
-body {
-    font-size: 0.8rem;
-}
-
-/* Main Backgrounds */
-#sidebar, #main footer .wrap, body #mainHeader, footer .wrap, #sidebar .storage, #footer, body.outside #mainHeader {
-    background: #292929;
-}
-/* Header Search Bar */
-#mainHeader .search.dark input {
-    background: #412A22;
-    color: #F2E6B6;
-    font-weight: bold;
-}
-#mainHeader .search input {
-    border-radius: 0.3rem;
-    border: 2px double #F2E6B6;
-}
-
-p.hello {
-    opacity:0.6;
-}
-/* Links */
-#mainHeader .dark button, #mainHeader p, #mainHeader a, 
-#sidebar ul li a, #sidebar ul li a span, #sidebar ul.menu li a.active,
-#sidebar ul.menu li a.active span, .sizebar, #footer .wrap a, #listing-actions-buttons ul li a:hover, 
-#sidebar ul.menu li a.active, ul.menu li a.active span, #mainHeader a span {
-    color: #F2E6B6 !important;
-}
-#mainHeader .dark button:hover, #mainHeader .dark button:hover .fa,
-#compose_button span, #compose_button strong, #mainHeader a:active, 
-#mainHeader a:hover, #mainHeader a:hover, #mainHeader li a.active span, 
-#mainHeader li a:hover span, #sidebar,#sidebar ul.menu li a:hover span, 
-#sidebar ul.menu li a.active:hover, #footer .wrap a:hover, #sidebar ul.menu li a:hover {
-    color: #412A22 !important;
-}
-
-/* Sidebar compose button */
-#compose_button strong, #sidebar #compose_button a  span {
-    color: #FFF !important;
-}
-
-#compose_button a {
-    background: #5B7876;
-}
-
-#compose_button a:active, #compose_button a:hover, .fill {
-    background: #8F9E8B;
-}
-
-/* Sidebar Number */
-#sidebar .number, #sidebar .active .number {
-    background: #F2E6B6;
-    color: #292929;
-}
-
-#sidebar ul.menu li a:hover .number {
-    background: #412A22;
-    color: #FFF;
-}
-
-/* Sidebar Active Section */
-#sidebar ul.menu li a.active {
-    background: #8F9E8B;
-}
-
-/*Sidebar Dividers */
-.divider {
-    opacity: 0.2;
-}
-
-/* Footer Text */
-#footer .wrap {
-    color: #fff;
-}
-/*Mail Commandbar */
-#messages tbody {
-    font-size: 0.8rem !important;
-}
-/* Page Buttons */
-.pure-button.pure-button-primary, body .ui-button.pure-button-primary {
-    background: #292929;
-    transition: background .2s ease-in;
-}
-.pure-button.pure-button-primary:focus, .pure-button.pure-button-primary:hover, body .ui-button.pure-button-primary:focus, body .ui-button.pure-button-primary:hover {
-    background: #412A22;
-}
-/* Labels */
-#listing .pmlabel {
-    border-radius: 0.2rem;
-    padding: 0.1rem 0.7rem;
-}
-/*Reading Mail*/
-#primaryHeader #titleBar h1 {
-    font-size: 0.9rem;
-}
-#page-m .pmlabel {
-    padding: 0.1rem 1.2rem;
-    padding-left: 0.6rem;
-    border-radius: 0.2rem;
-}
-span.bubble {
-    padding: 0.1rem 0.5rem;
-}
-span.bubble:hover {
-    background: #412A22 !important;
-    border-color: #36221C !important;
-    color:#FFF !important;
-}
-#dkim .verified {
-    color:#8CC63F;
-}
-/*Unread*/
-#messages tr.unread td {
-    background: #fff;
-}
-
-#messages tr.unread, #messages tr.unread a, #messages tr.unread td {
-    color: #292929 !important;
-}
-/*Starred Mails*/
-body table#messages tr.starred td {
-    background: #F2E6B6;
-}
-/*Responsive Menu Background */
-#mmm {
-    background: #36221C;
-}
-
diff --git a/Themes/v1.16/green_lume.css b/Themes/v1.16/green_lume.css
deleted file mode 100644
index cf15684..0000000
--- a/Themes/v1.16/green_lume.css
+++ /dev/null
@@ -1,192 +0,0 @@
-*:not(.fa) {
-    font-family: ‘Trebuchet MS’, Helvetica, sans-serif;
-}
-
-body {
-    font-size: 0.8rem;
-}
-/* =============
-   == Sidebar == 
-   ============= */
-
-/* COMPOSE BUTTON */
-#compose_button a {
-    background: #8cc63f none repeat scroll 0% 0%;
-}
-#compose_button a:active, #compose_button a:hover {
-    background: #e01b2a none repeat scroll 0% 0%; 
-}
-/* SIDEBAR BACKGROUND */
-#sidebar {
-    background: #1a1a1a;
-    /*border-right: 1px solid rgba(0, 0, 35, 0.5);*/
-}
-/* SIDEBAR LINKS */
-#sidebar ul li a span, #sidebar ul li a {
-    color: #fff;
-}
-#sidebar ul.menu li a:hover, #sidebar ul.menu li a:hover span {
-    color: #8cc63f;
-}
-/* SIDEBAR ACTIVE SECTION */
-#sidebar ul.menu li a.active {
-    background-color: rgba(10, 10, 10, 0.5);
-}
-/* NUMBER OF MESSAGES */
-#sidebar .number {
-    background: rgba(0,0,0,0);
-    color: #fff;
-    font-size: 0.8rem;
-}
-#sidebar .number:active {
-    font-size: 0.8rem;
-    color: #fff;
-}
-
-#sidebar ul.menu li a:hover .number {
-    background: #e01b2a;
-    color: #fff;
-}
-/* Storage at the end of the side bar. */
-#sidebar .storage {
-    background: #1a1a1a none repeat scroll 0% 0%;
-}
-
-.sizebar {
-    color: #fff;
-    font-size: 0.8rem;
-}
-
-.fill {
-    background: transparent linear-gradient(to bottom, greenyellow 0px, #8cc63f 100%) repeat scroll 0% 0%
-}
-/* =============
-   == TOP BAR == 
-   ============= */
-
-/* Top bar and footer background */
-#main footer .wrap, body #mainHeader, footer .wrap {
-    background-color: #1a1a1a;;
-}
-
-/* Search bar */
-#mainHeader .search.dark input {
-    background: rgba(0,0,0,0) none repeat scroll 0% 0%;
-    border: 2px solid #8cc63f;
-    color: greenyellow;
-    font-family: ‘Trebuchet MS’, Helvetica, sans-serif;
-    border-radius: 0.1rem;
-
-}
-/* Magnifing glass and down arrow */
-#mainHeader .dark button, #mainHeader .dark button .fa{
-    color: #8cc63f;
-}
-#mainHeader .dark button:hover, #mainHeader .dark button:hover .fa {
-    color: #e01b2a;
-}
-
-#mainHeader a, #mainHeader a span {
-    color: #fff;
-}
-
-#mainHeader a:active, #mainHeader a:hover, #mainHeader li a:hover span {
-    color: #e01b2a;
-}
-
-/*Decrypt page logo*/
-#mainHeader .navlogo {
-    background: #8cc63f;
-    margin: 0 1rem 0 0;
-}
-
-#footer .wrap {
-    color: #fff;
-}
-
-#footer .wrap a {
-    color: greenyellow;
-}
-
-#footer .wrap a:hover {
-    color: #e01b2a;
-}
-
-.pure-button.pure-button-primary, body .ui-button.pure-button-primary {
-    background: #1a1a1a;
-}
-
-.pure-button.pure-button-primary:focus, .pure-button.pure-button-primary:hover, body .ui-button.pure-button-primary:focus, body .ui-button.pure-button-primary:hover {
-    background: #e01b2a;
-}
-
-#announcement {
-    font-size: 0.8rem;
-    color: #fff;
-    background: rgba(0,0,0,0.8);
-}
-
-body a {
-    color: #8cc63f;
-}
-a:hover {
-    color: #e01b2a;
-}
-/* Reading Mail*/
-#messages tbody {
-    font-size: 0.8rem;
-}
-/* ICONS AND MAIL */
-#primaryHeader #titleBar h1 {
-    font-size: 0.9rem;
-}
-#page-m .pmlabel {
-    padding: 0.1rem 1.2rem;
-    padding-left: 0.6rem;
-    border-radius: 0.2rem;
-}
-span.bubble {
-    padding: 0.1rem 0.5rem;
-}
-
-body table#messages tr.starred td {
-    /*background: rgba(216,18,32,0.0);*/
-}
-
-#dkim .verified {
-    color: #60c43f !important;
-}
-
-table .fa.fa-lock {
-    color: #e01b2a !important;
-}
-
-#messages .fa-flag {
-    color:#336 !important;
-}
-/*Responsive Icons */
-#mainHeader .fa {
-    color: #8cc63f;
-}
-/*Responsive Menu */
-#mmm {
-    background: #1a1a1a;
-}
-#listing-actions-buttons ul li a:hover, #listing-actions-buttons ul li button:hover, #message-actions-buttons ul li a:hover, #message-actions-buttons ul li button:hover, .pure-button:focus, /*.pure-button:hover*/, body .ui-button:focus, body .ui-button:hover {
-    color: #8cc63f; !important;
-}
-
-/*Labels*/
-
-#listing .pmlabel {
-    border-radius: 0.2rem;
-    padding: 0.1rem 0.7rem;
-    font-size: 0.7rem;
-    font-weight: 700 !important;
-}
-
-.pmlabel {
-    background: #fbb03b;
-}
-
-
diff --git a/Themes/v1.16/halow_summer_06.css b/Themes/v1.16/halow_summer_06.css
deleted file mode 100644
index 8fea624..0000000
--- a/Themes/v1.16/halow_summer_06.css
+++ /dev/null
@@ -1,138 +0,0 @@
-*:not(.fa) {
-    font-family: ‘Trebuchet MS’, Helvetica, sans-serif;
-}
-body {
-    font-size: 0.8rem;
-}
-
-#sidebar a img {
-    background: rgba(68,68,68,0.5);
-    padding: 0.5rem 0.3rem;
-    border-radius: 3px;
-}
-
-/* Main Backgrounds */
-#sidebar, #main footer .wrap, body #mainHeader, footer .wrap, #sidebar .storage, #footer, body.outside #mainHeader {
-    background: #E7E9D1;
-}
-/* Header Search Bar */
-#mainHeader .search.dark input {
-    background: #BAB293;
-    color: #2B2922;
-    font-weight: bold;
-}
-#mainHeader .search input {
-    border-radius: 0.3rem;
-    border: 2px double #2B2922;
-}
-
-p.hello {
-    opacity:0.6;
-}
-/* Links */
-#mainHeader .dark button, #mainHeader p, #mainHeader a, 
-#sidebar ul li a, #sidebar ul li a span, #sidebar ul.menu li a.active,
-#sidebar ul.menu li a.active span, .sizebar, #footer .wrap a, #listing-actions-buttons ul li a:hover, 
-#sidebar ul.menu li a.active, ul.menu li a.active span {
-    color: #444444 !important;
-}
-#mainHeader .dark button:hover, #mainHeader .dark button:hover .fa,
-#compose_button span, #compose_button strong, #mainHeader a:active, 
-#mainHeader a:hover, #mainHeader a:hover, #mainHeader li a.active span, 
-#mainHeader li a:hover span, #sidebar,#sidebar ul.menu li a:hover span, 
-#sidebar ul.menu li a.active:hover, #footer .wrap a:hover, #sidebar ul.menu li a:hover, #mainHeader a span {
-    color: #901808 !important;
-}
-
-/* Sidebar compose button */
-#compose_button strong, #sidebar #compose_button a  span {
-    color: #FFF !important;
-}
-
-#compose_button a {
-    background: #A32500;
-}
-
-#compose_button a:active, #compose_button a:hover, .fill {
-    background: #444444;
-}
-
-/* Sidebar Number */
-#sidebar .number, #sidebar .active .number {
-    background: #444444;
-    color: #FCFAE6;
-}
-
-#sidebar ul.menu li a:hover .number {
-    background: #901808;
-    color: #FCFAE6;
-}
-
-/* Sidebar Active Section */
-#sidebar ul.menu li a.active {
-    background: #D3D4AA;
-}
-
-/*Sidebar Dividers */
-.divider {
-    opacity: 0.2;
-}
-
-/* Footer Text */
-#footer .wrap {
-    color: #fff;
-}
-/*Mail Commandbar */
-#messages tbody {
-    font-size: 0.8rem !important;
-}
-/* Page Buttons */
-.pure-button.pure-button-primary, body .ui-button.pure-button-primary {
-    background: #444444;
-    transition: background .2s ease-in;
-}
-.pure-button.pure-button-primary:focus, .pure-button.pure-button-primary:hover, body .ui-button.pure-button-primary:focus, body .ui-button.pure-button-primary:hover {
-    background: #901808;
-}
-/* Labels */
-#listing .pmlabel {
-    border-radius: 0.2rem;
-    padding: 0.1rem 0.7rem;
-}
-/*Reading Mail*/
-#primaryHeader #titleBar h1 {
-    font-size: 0.9rem;
-}
-#page-m .pmlabel {
-    padding: 0.1rem 1.2rem;
-    padding-left: 0.6rem;
-    border-radius: 0.2rem;
-}
-span.bubble {
-    padding: 0.1rem 0.5rem;
-}
-span.bubble:hover {
-    background: #444444 !important;
-    border-color: #1c1c1c !important;
-    color:#FFF !important;
-}
-#dkim .verified {
-    color:#8CC63F;
-}
-/*Unread*/
-#messages tr.unread td {
-    background: #fff;
-}
-
-#messages tr.unread, #messages tr.unread a, #messages tr.unread td {
-    color: #444444 !important;
-}
-/*Starred Mails*/
-body table#messages tr.starred td {
-    background: #FCFAE6;
-}
-/*Responsive Menu Background */
-#mmm {
-    background: #FCFAE6;
-}
-
diff --git a/Themes/v1.16/japanese_garden.css b/Themes/v1.16/japanese_garden.css
deleted file mode 100644
index f849c91..0000000
--- a/Themes/v1.16/japanese_garden.css
+++ /dev/null
@@ -1,132 +0,0 @@
-*:not(.fa) {
-    font-family: ‘Trebuchet MS’, Helvetica, sans-serif;
-}
-body {
-    font-size: 0.8rem;
-}
-
-/* Main Backgrounds */
-#sidebar, #main footer .wrap, body #mainHeader, footer .wrap, #sidebar .storage, #footer, body.outside #mainHeader {
-    background: #A39770;
-}
-/* Header Search Bar */
-#mainHeader .search.dark input {
-    background: #BAB293;
-    color: #2B2922;
-    font-weight: bold;
-}
-#mainHeader .search input {
-    border-radius: 0.3rem;
-    border: 2px double #2B2922;
-}
-
-p.hello {
-    opacity:0.6;
-}
-/* Links */
-#mainHeader .dark button, #mainHeader p, #mainHeader a, 
-#sidebar ul li a, #sidebar ul li a span, #sidebar ul.menu li a.active,
-#sidebar ul.menu li a.active span, .sizebar, #footer .wrap a, #listing-actions-buttons ul li a:hover, 
-#sidebar ul.menu li a.active, ul.menu li a.active span, #mainHeader a span {
-    color: #2B2922 !important;
-}
-#mainHeader .dark button:hover, #mainHeader .dark button:hover .fa,
-#compose_button span, #compose_button strong, #mainHeader a:active, 
-#mainHeader a:hover, #mainHeader a:hover, #mainHeader li a.active span, 
-#mainHeader li a:hover span, #sidebar,#sidebar ul.menu li a:hover span, 
-#sidebar ul.menu li a.active:hover, #footer .wrap a:hover, #sidebar ul.menu li a:hover {
-    color: #A32500 !important;
-}
-
-/* Sidebar compose button */
-#compose_button strong, #sidebar #compose_button a  span {
-    color: #FFF !important;
-}
-
-#compose_button a {
-    background: #A32500;
-}
-
-#compose_button a:active, #compose_button a:hover, .fill {
-    background: #2B2922;
-}
-
-/* Sidebar Number */
-#sidebar .number, #sidebar .active .number {
-    background: #2B2922;
-    color: #A32500;
-}
-
-#sidebar ul.menu li a:hover .number {
-    background: #A32500;
-    color: #2B2922;
-}
-
-/* Sidebar Active Section */
-#sidebar ul.menu li a.active {
-    background: #BAB293;
-}
-
-/*Sidebar Dividers */
-.divider {
-    opacity: 0.2;
-}
-
-/* Footer Text */
-#footer .wrap {
-    color: #fff;
-}
-/*Mail Commandbar */
-#messages tbody {
-    font-size: 0.8rem !important;
-}
-/* Page Buttons */
-.pure-button.pure-button-primary, body .ui-button.pure-button-primary {
-    background: #2B2922;
-    transition: background .2s ease-in;
-}
-.pure-button.pure-button-primary:focus, .pure-button.pure-button-primary:hover, body .ui-button.pure-button-primary:focus, body .ui-button.pure-button-primary:hover {
-    background: #A32500;
-}
-/* Labels */
-#listing .pmlabel {
-    border-radius: 0.2rem;
-    padding: 0.1rem 0.7rem;
-}
-/*Reading Mail*/
-#primaryHeader #titleBar h1 {
-    font-size: 0.9rem;
-}
-#page-m .pmlabel {
-    padding: 0.1rem 1.2rem;
-    padding-left: 0.6rem;
-    border-radius: 0.2rem;
-}
-span.bubble {
-    padding: 0.1rem 0.5rem;
-}
-span.bubble:hover {
-    background: #A39770 !important;
-    border-color: #2B2922 !important;
-    color:#FFF !important;
-}
-#dkim .verified {
-    color:#8CC63F;
-}
-/*Unread*/
-#messages tr.unread td {
-    background: #fff;
-}
-
-#messages tr.unread, #messages tr.unread a, #messages tr.unread td {
-    color: #2B2922 !important;
-}
-/*Starred Mails*/
-body table#messages tr.starred td {
-    background: #EFE4BD;
-}
-/*Responsive Menu Background */
-#mmm {
-    background: #EFE4BD;
-}
-
diff --git a/Themes/v1.16/sea_wolf.css b/Themes/v1.16/sea_wolf.css
deleted file mode 100644
index 53ab63a..0000000
--- a/Themes/v1.16/sea_wolf.css
+++ /dev/null
@@ -1,135 +0,0 @@
-*:not(.fa) {
-    font-family: ‘Trebuchet MS’, Helvetica, sans-serif;
-}
-body {
-    font-size: 0.8rem;
-}
-#sidebar a img {
-    background: #DC3522;
-    padding: 0.5rem;
-    border-radius: 5px;
-}
-/* Main Backgrounds */
-#sidebar, #main footer .wrap, body #mainHeader, footer .wrap, #sidebar .storage, #footer, body.outside #mainHeader {
-    background: #1E1E20;
-}
-/* Header Search Bar */
-#mainHeader .search.dark input {
-    background: #374140;
-    color: #D9CB9E;
-}
-#mainHeader .search input {
-    border-radius: 0.3rem;
-    border: 1px double #D9CB9E;
-}
-
-p.hello {
-    opacity:0.6;
-}
-/* Links */
-#mainHeader .dark button, #mainHeader p, #mainHeader a, 
-#sidebar ul li a, #sidebar ul li a span, #sidebar ul.menu li a.active,
-#sidebar ul.menu li a.active span, .sizebar, #footer .wrap a, #listing-actions-buttons ul li a:hover {
-    color: #D9CB9E !important;
-}
-#mainHeader .dark button:hover, #mainHeader .dark button:hover .fa,
-#compose_button span, #compose_button strong, #mainHeader a:active, 
-#mainHeader a:hover, #mainHeader a:hover, #mainHeader li a.active span, 
-#mainHeader li a:hover span, #sidebar ul.menu li a.active span, 
-#sidebar ul.menu li a:hover span, #sidebar ul.menu li a.active:hover, #sidebar ul.menu li a.active,
-#footer .wrap a:hover, #sidebar ul.menu li a:hover, #mainHeader a span {
-    color: #DC3522 !important;
-}
-
-/* Sidebar compose button */
-#compose_button strong, #sidebar #compose_button a  span {
-    color: #fff !important;
-}
-
-#compose_button a {
-    background: #DC3522;
-}
-
-#compose_button a:active, #compose_button a:hover, .fill {
-    background: #374140;
-}
-
-/* Sidebar Number */
-#sidebar .number, #sidebar .active .number {
-    background: #2A2C2B;
-    color: #D9CB9E;
-}
-
-#sidebar ul.menu li a:hover .number {
-    background: #fff;
-    color: #DC3522;
-}
-
-/* Sidebar Active Section */
-#sidebar ul.menu li a.active {
-    background: #374140;
-}
-
-/*Sidebar Dividers */
-.divider {
-    opacity: 0.3;
-}
-
-/* Footer Text */
-#footer .wrap {
-    color: #fff;
-}
-/*Mail Commandbar */
-#messages tbody {
-    font-size: 0.8rem !important;
-}
-/* Page Buttons */
-.pure-button.pure-button-primary, body .ui-button.pure-button-primary {
-    background: #2A2C2B;
-    transition: background .2s ease-in;
-}
-.pure-button.pure-button-primary:focus, .pure-button.pure-button-primary:hover, body .ui-button.pure-button-primary:focus, body .ui-button.pure-button-primary:hover {
-    background: #DC3522;
-}
-/* Labels */
-#listing .pmlabel {
-    border-radius: 0.2rem;
-    padding: 0.1rem 0.7rem;
-}
-/*Reading Mail*/
-#primaryHeader #titleBar h1 {
-    font-size: 0.9rem;
-}
-#page-m .pmlabel {
-    padding: 0.1rem 1.2rem;
-    padding-left: 0.6rem;
-    border-radius: 0.2rem;
-}
-span.bubble {
-    padding: 0.1rem 0.5rem;
-}
-span.bubble:hover {
-    background: #DC3522 !important;
-    border-color: #C92518 !important;
-    color:#fff !important;
-}
-#dkim .verified {
-    color:#8CC63F;
-}
-/*Unread*/
-#messages tr.unread td {
-    background: #fff;
-}
-
-#messages tr.unread, #messages tr.unread a, #messages tr.unread td {
-    color: #DC3522 !important;
-}
-/*Starred Mails*/
-body table#messages tr.starred td {
-    background: #FFC;
-}
-/*Responsive Menu Background */
-#mmm {
-    background: #2A2C2B;
-}
-
diff --git a/Themes/v1.16/this_green.css b/Themes/v1.16/this_green.css
deleted file mode 100644
index e050e57..0000000
--- a/Themes/v1.16/this_green.css
+++ /dev/null
@@ -1,132 +0,0 @@
-*:not(.fa) {
-    font-family: ‘Trebuchet MS’, Helvetica, sans-serif;
-}
-body {
-    font-size: 0.8rem;
-}
-
-/* Main Backgrounds */
-#sidebar, #main footer .wrap, body #mainHeader, footer .wrap, #sidebar .storage, #footer, body.outside #mainHeader {
-    background: #00261C;
-}
-/* Header Search Bar */
-#mainHeader .search.dark input {
-    background: #167F39;
-    color: #FFF;
-    font-weight: bold;
-}
-#mainHeader .search input {
-    border-radius: 0.3rem;
-    border: 2px double #044C29;
-}
-
-p.hello {
-    opacity:0.6;
-}
-/* Links */
-#mainHeader .dark button, #mainHeader p, #mainHeader a, 
-#sidebar ul li a, #sidebar ul li a span, #sidebar ul.menu li a.active,
-#sidebar ul.menu li a.active span, .sizebar, #footer .wrap a, #listing-actions-buttons ul li a:hover, 
-#sidebar ul.menu li a.active, ul.menu li a.active span, #mainHeader a span {
-    color: #FFF !important;
-}
-#mainHeader .dark button:hover, #mainHeader .dark button:hover .fa,
-#compose_button span, #compose_button strong, #mainHeader a:active, 
-#mainHeader a:hover, #mainHeader a:hover, #mainHeader li a.active span, 
-#mainHeader li a:hover span, #sidebar,#sidebar ul.menu li a:hover span, 
-#sidebar ul.menu li a.active:hover, #footer .wrap a:hover, #sidebar ul.menu li a:hover {
-    color: #45BF55 !important;
-}
-
-/* Sidebar compose button */
-#compose_button strong, #sidebar #compose_button a  span {
-    color: #FFF !important;
-}
-
-#compose_button a {
-    background: #044C29;
-}
-
-#compose_button a:active, #compose_button a:hover, .fill {
-    background: #167F39;
-}
-
-/* Sidebar Number */
-#sidebar .number, #sidebar .active .number {
-    background: #FFF;
-    color: #45BF55;
-}
-
-#sidebar ul.menu li a:hover .number {
-    background: #45BF55;
-    color: #FFF;
-}
-
-/* Sidebar Active Section */
-#sidebar ul.menu li a.active {
-    background: #96ED89;
-}
-
-/*Sidebar Dividers */
-.divider {
-    opacity: 0.2;
-}
-
-/* Footer Text */
-#footer .wrap {
-    color: #fff;
-}
-/*Mail Commandbar */
-#messages tbody {
-    font-size: 0.8rem !important;
-}
-/* Page Buttons */
-.pure-button.pure-button-primary, body .ui-button.pure-button-primary {
-    background: #00261C;
-    transition: background .2s ease-in;
-}
-.pure-button.pure-button-primary:focus, .pure-button.pure-button-primary:hover, body .ui-button.pure-button-primary:focus, body .ui-button.pure-button-primary:hover {
-    background: #167F39;
-}
-/* Labels */
-#listing .pmlabel {
-    border-radius: 0.2rem;
-    padding: 0.1rem 0.7rem;
-}
-/*Reading Mail*/
-#primaryHeader #titleBar h1 {
-    font-size: 0.9rem;
-}
-#page-m .pmlabel {
-    padding: 0.1rem 1.2rem;
-    padding-left: 0.6rem;
-    border-radius: 0.2rem;
-}
-span.bubble {
-    padding: 0.1rem 0.5rem;
-}
-span.bubble:hover {
-    background: #167F39 !important;
-    border-color: #00261C !important;
-    color:#FFF !important;
-}
-#dkim .verified {
-    color:#8CC63F;
-}
-/*Unread*/
-#messages tr.unread td {
-    background: #fff;
-}
-
-#messages tr.unread, #messages tr.unread a, #messages tr.unread td {
-    color: #292929 !important;
-}
-/*Starred Mails*/
-body table#messages tr.starred td {
-    background: #96ED89;
-}
-/*Responsive Menu Background */
-#mmm {
-    background: #044C29;
-}
-
diff --git a/Themes/v1.16/tweak_default.css b/Themes/v1.16/tweak_default.css
deleted file mode 100644
index 548c585..0000000
--- a/Themes/v1.16/tweak_default.css
+++ /dev/null
@@ -1,52 +0,0 @@
-*:not(.fa) {
-    font-family: ‘Trebuchet MS’, Helvetica, sans-serif;
-}
-body {
-    font-size: 0.8rem;
-}
-
-/* Header Search Bar */
-#mainHeader .search.dark input {
-    font-weight: bold;
-}
-#mainHeader .search input {
-    border-radius: 0.3rem;
-}
-
-p.hello {
-    opacity:0.6;
-}
-
-/*Sidebar Dividers */
-.divider {
-    opacity: 0.2;
-}
-
-/*Mail Commandbar */
-#messages tbody {
-    font-size: 0.8rem !important;
-}
-
-/* Labels */
-#listing .pmlabel {
-    border-radius: 0.2rem;
-    padding: 0.1rem 0.7rem;
-}
-/*Reading Mail*/
-#primaryHeader #titleBar h1 {
-    font-size: 0.9rem;
-}
-#page-m .pmlabel {
-    padding: 0.1rem 1.2rem;
-    padding-left: 0.6rem;
-    border-radius: 0.2rem;
-}
-span.bubble {
-    padding: 0.1rem 0.5rem;
-}
-
-#dkim .verified {
-    color:#8CC63F;
-}
-
-
diff --git a/Themes/v1.16/vintage_ralph_lauren.css b/Themes/v1.16/vintage_ralph_lauren.css
deleted file mode 100644
index cfa92d4..0000000
--- a/Themes/v1.16/vintage_ralph_lauren.css
+++ /dev/null
@@ -1,132 +0,0 @@
-*:not(.fa) {
-    font-family: ‘Trebuchet MS’, Helvetica, sans-serif;
-}
-body {
-    font-size: 0.8rem;
-}
-
-/* Main Backgrounds */
-#sidebar, #main footer .wrap, body #mainHeader, footer .wrap, #sidebar .storage, #footer, body.outside #mainHeader {
-    background: #2F343B;
-}
-/* Header Search Bar */
-#mainHeader .search.dark input {
-    background: #C77966;
-    color: #2F343B;
-    font-weight: bold;
-}
-#mainHeader .search input {
-    border-radius: 0.3rem;
-    border: 2px solid #703030;
-}
-
-p.hello {
-    opacity:0.6;
-}
-/* Links */
-#mainHeader .dark button, #mainHeader p, #mainHeader a, 
-#sidebar ul li a, #sidebar ul li a span, #sidebar ul.menu li a.active,
-#sidebar ul.menu li a.active span, .sizebar, #footer .wrap a, #listing-actions-buttons ul li a:hover, 
-#sidebar ul.menu li a.active, ul.menu li a.active span, #mainHeader a span {
-    color: #C6CCBF !important;
-}
-#mainHeader .dark button:hover, #mainHeader .dark button:hover .fa,
-#compose_button span, #compose_button strong, #mainHeader a:active, 
-#mainHeader a:hover, #mainHeader a:hover, #mainHeader li a.active span, 
-#mainHeader li a:hover span, #sidebar,#sidebar ul.menu li a:hover span, 
-#sidebar ul.menu li a.active:hover, #footer .wrap a:hover, #sidebar ul.menu li a:hover {
-    color: #E3CDA4 !important;
-}
-
-/* Sidebar compose button */
-#compose_button strong, #sidebar #compose_button a  span {
-    color: #E6E6E6 !important;
-}
-
-#compose_button a {
-    background: #703030;
-}
-
-#compose_button a:active, #compose_button a:hover, .fill {
-    background: #C77966;
-}
-
-/* Sidebar Number */
-#sidebar .number, #sidebar .active .number {
-    background: #7E827A;
-    color: #2F343B;
-}
-
-#sidebar ul.menu li a:hover .number {
-    background: #703030;
-    color: #C77966;
-}
-
-/* Sidebar Active Section */
-#sidebar ul.menu li a.active {
-    background: #C77966;
-}
-
-/*Sidebar Dividers */
-.divider {
-    opacity: 0.2;
-}
-
-/* Footer Text */
-#footer .wrap {
-    color: #fff;
-}
-/*Mail Commandbar */
-#messages tbody {
-    font-size: 0.8rem !important;
-}
-/* Page Buttons */
-.pure-button.pure-button-primary, body .ui-button.pure-button-primary {
-    background: #2F343B;
-    transition: background .2s ease-in;
-}
-.pure-button.pure-button-primary:focus, .pure-button.pure-button-primary:hover, body .ui-button.pure-button-primary:focus, body .ui-button.pure-button-primary:hover {
-    background: #703030;
-}
-/* Labels */
-#listing .pmlabel {
-    border-radius: 0.2rem;
-    padding: 0.1rem 0.7rem;
-}
-/*Reading Mail*/
-#primaryHeader #titleBar h1 {
-    font-size: 0.9rem;
-}
-#page-m .pmlabel {
-    padding: 0.1rem 1.2rem;
-    padding-left: 0.6rem;
-    border-radius: 0.2rem;
-}
-span.bubble {
-    padding: 0.1rem 0.5rem;
-}
-span.bubble:hover {
-    background: #703030 !important;
-    border-color: #5C2828 !important;
-    color:#FFF !important;
-}
-#dkim .verified {
-    color:#8CC63F;
-}
-/*Unread*/
-#messages tr.unread td {
-    background: #fff;
-}
-
-#messages tr.unread, #messages tr.unread a, #messages tr.unread td {
-    color: #5C2828 !important;
-}
-/*Starred Mails*/
-body table#messages tr.starred td {
-    background: #E3CDA4;
-}
-/*Responsive Menu Background */
-#mmm {
-    background: #5C2828;
-}
-
diff --git a/Themes/v1.16/vitamin_c.css b/Themes/v1.16/vitamin_c.css
deleted file mode 100644
index a795aa8..0000000
--- a/Themes/v1.16/vitamin_c.css
+++ /dev/null
@@ -1,132 +0,0 @@
-*:not(.fa) {
-    font-family: ‘Trebuchet MS’, Helvetica, sans-serif;
-}
-body {
-    font-size: 0.8rem;
-}
-
-/* Main Backgrounds */
-#sidebar, #main footer .wrap, body #mainHeader, footer .wrap, #sidebar .storage, #footer, body.outside #mainHeader {
-    background: #004358;
-}
-/* Header Search Bar */
-#mainHeader .search.dark input {
-    background: #1F8A70;
-    color: #BEDB39;
-    font-weight: bold;
-}
-#mainHeader .search input {
-    border-radius: 0.3rem;
-    border: 2px double #BEDB39;
-}
-
-p.hello {
-    opacity:0.6;
-}
-/* Links */
-#mainHeader .dark button, #mainHeader p, #mainHeader a, 
-#sidebar ul li a, #sidebar ul li a span, #sidebar ul.menu li a.active,
-#sidebar ul.menu li a.active span, .sizebar, #footer .wrap a, #listing-actions-buttons ul li a:hover, 
-#sidebar ul.menu li a.active, ul.menu li a.active span, #mainHeader a span {
-    color: #FFE11A !important;
-}
-#mainHeader .dark button:hover, #mainHeader .dark button:hover .fa,
-#compose_button span, #compose_button strong, #mainHeader a:active, 
-#mainHeader a:hover, #mainHeader a:hover, #mainHeader li a.active span, 
-#mainHeader li a:hover span, #sidebar,#sidebar ul.menu li a:hover span, 
-#sidebar ul.menu li a.active:hover, #footer .wrap a:hover, #sidebar ul.menu li a:hover {
-    color: #FD7400 !important;
-}
-
-/* Sidebar compose button */
-#compose_button strong, #sidebar #compose_button a  span {
-    color: #E6E6E6 !important;
-}
-
-#compose_button a {
-    background: #1F8A70;
-}
-
-#compose_button a:active, #compose_button a:hover, .fill {
-    background: #FD7400;
-}
-
-/* Sidebar Number */
-#sidebar .number, #sidebar .active .number {
-    background: #1F8A70;
-    color: #FFE11A;
-}
-
-#sidebar ul.menu li a:hover .number {
-    background: #FD7400;
-    color: #FFE11A;
-}
-
-/* Sidebar Active Section */
-#sidebar ul.menu li a.active {
-    background: #003C4F;
-}
-
-/*Sidebar Dividers */
-.divider {
-    opacity: 0.2;
-}
-
-/* Footer Text */
-#footer .wrap {
-    color: #fff;
-}
-/*Mail Commandbar */
-#messages tbody {
-    font-size: 0.8rem !important;
-}
-/* Page Buttons */
-.pure-button.pure-button-primary, body .ui-button.pure-button-primary {
-    background: #004358;
-    transition: background .2s ease-in;
-}
-.pure-button.pure-button-primary:focus, .pure-button.pure-button-primary:hover, body .ui-button.pure-button-primary:focus, body .ui-button.pure-button-primary:hover {
-    background: #1F8A70;
-}
-/* Labels */
-#listing .pmlabel {
-    border-radius: 0.2rem;
-    padding: 0.1rem 0.7rem;
-}
-/*Reading Mail*/
-#primaryHeader #titleBar h1 {
-    font-size: 0.9rem;
-}
-#page-m .pmlabel {
-    padding: 0.1rem 1.2rem;
-    padding-left: 0.6rem;
-    border-radius: 0.2rem;
-}
-span.bubble {
-    padding: 0.1rem 0.5rem;
-}
-span.bubble:hover {
-    background: #1F8A70 !important;
-    border-color: #004358 !important;
-    color:#FFF !important;
-}
-#dkim .verified {
-    color:#8CC63F;
-}
-/*Unread*/
-#messages tr.unread td {
-    background: #fff;
-}
-
-#messages tr.unread, #messages tr.unread a, #messages tr.unread td {
-    color: #FD7400 !important;
-}
-/*Starred Mails*/
-body table#messages tr.starred td {
-    background: rgba(190, 219, 57, 0.62) none repeat scroll 0% 0%;
-}
-/*Responsive Menu Background */
-#mmm {
-    background: #1F8A70;
-}
-
diff --git a/Themes/v3.0/green_lume.css b/Themes/v3.0/green_lume.css
deleted file mode 100644
index aae3cbf..0000000
--- a/Themes/v3.0/green_lume.css
+++ /dev/null
@@ -1,285 +0,0 @@
-/* =========================================== *
- * GREEN LUME 3.0 THEME BY CRISTIANO ALMEIDA
- * 
- * @_csalmeida
- * http://www.csalmeida.com
- * https://www.behance.net/_csalmeida
- *
- * =========================================== */
-
-/* Frame (topbar and sidebar.) */
-
-header#pm_header-desktop {
-    background: #1a1a1a;
-}
-
-body section.sidebar {
-    background: #1a1a1a;
-}
-
-header#pm_header-desktop a.logo {
-    background: #1a1a1a;
-}
-
-/* Search bar */
-form.searchForm fieldset {
-    border-radius: 2px;
-    background-color: #1a1a1a;
-}
-
-form.searchForm fieldset button[type="button"] {
-    color: #8cc63f;
-    background-color: #1a1a1a;
-    border-radius: 2px 0 0 2px;
-}
-
-form.searchForm fieldset #closeAdvSearch, form.searchForm fieldset button[type="submit"] {
-    color: #8cc63f;
-}
-
-form.searchForm fieldset button[type="button"]:hover {
-    background-color: #8cc63f;
-}
-
-form.searchForm.adv fieldset #closeAdvSearch, form.searchForm.adv fieldset button[type="submit"] {
-    background-color: #1a1a1a;
-    border-radius: 2px 0 0 2px;
-}
-
-.pm_form .input-icon .fa {
-    color: #8cc63f;
-}
-
-/* Top Navigation */
-
-.pm_button.primary {
-    background-color: #8cc63f;
-    border-color: #8cc63f;
-}
-
-.pm_button.primary:hover {
-    background-color: #8cc63f;
-    border-color: #8cc63f;
-}
-
-header#pm_header-desktop ul.navigation li a .fa {
-    color: #fff;   
-}
-
-header#pm_header-desktop ul.navigation li a strong {
-    color: #fff;
-}
-
-/* TN Dropdown Menu */
-header#pm_header-desktop .pm_buttons .pm_button.primary {
-    background-color: #8cc63f !important;
-    border-color: #8cc63f !important;
-}
-
-/* TN Links Hover */
-header#pm_header-desktop ul.navigation li.active a, header#pm_header-desktop ul.navigation li:hover a {
-    border-top-color: #8cc63f !important;
-}
-
-header#pm_header-desktop ul.navigation li.active a strong, header#pm_header-desktop ul.navigation li:hover a strong {
-    color: #8cc63f;
-}
-
-header#pm_header-desktop ul.navigation li.active a .fa, header#pm_header-desktop ul.navigation li:hover a .fa {
-    color: #8cc63f;
-}
-
-header#pm_header-desktop ul.navigation li.active a strong, header#pm_header-desktop ul.navigation li:hover a strong {
-    color: #8cc63f;
-}
-
-/* Sidebar Navigation */
-body section.sidebar ul.menu li.active a i.fa {
-    color: #8cc63f;
-}
-
-body section.sidebar ul.menu li a {
-    color: #fff;
-}
-
-body section.sidebar ul.menu li a:hover {
-    color: #8cc63f;
-}
-
-body section.sidebar div.footer div.link a {
-    color: #8cc63f;
-}
-
-body section.sidebar div.footer .bar em {
-    background-color: #8cc63f;
-}
-
-body section.sidebar div.footer div.storage strong {
-    color: #8cc63f;
-}
-/* Label Navigation */
-
-body section.sidebar div.labels ul li a:hover {
-    color: #8cc63f;
-}
-
-body section.sidebar div.labels ul li a {
-    color: #fff;
-}
-
-/* Settings Navigation */
-
-#pm_settings .pm_tabs li.active a.pm_button {
-    background: #fff !important;
-    color: #1c1c1c;
-}
-
-#pm_settings .pm_tabs li a.pm_button {
-    border-color: #1c1c1c;
-    background: #1c1c1c;
-    color: #fff;
-}
-
-#pm_settings .pm_tabs li a.pm_button:hover {
-    background: #373737;
-}
-
-#pm_settings .pm_tabs {
-    /*background: #2f2e2e;*/
-    background: #474747;
-}
-
-/* Dashboard Settings */
-
-#pm_settings #plans header .link {
-    color: #8cc63f;
-}
-
-#pm_settings #plans .plans .plan header {
-    background: #1c1c1c;
-    border: 1px solid #1c1c1c;
-}
-
-#pm_settings #plans .plans .plan .price, #pm_settings #plans .plans .plan h3 {
-    color: #1c1c1c;
-}
-
-.pm_button.primary.disabled, .pm_button.primary[disabled] {
-    background: #8cc63f;
-}
-
-.pm_button.primary:active, .pm_button.primary:focus {
-    background: #8cc63f;
-    border-color: #8cc63f;
-}
-
-html.protonmail .text-purple {
-    color: #8cc63f;
-}
-
-/* Label Settings */
-
-.pm_button.round {
-    border-radius: 2px;
-    border: 1px solid #7b7b7b;
-}
-
-.pm_button.round .fa {
-    color: #8cc63f;
-}
-
-/* Security Settings */
-.pm_button {
-    color: #1c1c1c;
-}
-
-.pm_table td {
-    color: #1c1c1c;
-}
-
-/* Contacts */
-.pm_table th a {
-    color: #1c1c1c;
-}
-
-.pm_table th .fa {
-    color: #1c1c1c;
-}
-
-/* Report Bug */
-.pm_toggle.off .off {
-    background: #8cc63f;
-}
-
-p a {
-    color: #8cc63f;
-}
-
-/* Links */
-
-.pm_button.link {
-    color: #8cc63f;
-}
-
-/* Inbox */
-
-.pm_buttons a {
-    color: #1c1c1c;
-}
-
-body #conversation-list-rows .conversation.read {
-    color: #1c1c1c !important;
-}
-
-/* Reading e-mail. */
-#conversation-view .message .toggleDetails {
-    color: #8cc63f;
-}
-
-/* Composing e-mail */
-#pm_composer .composer header {
-    background: #2c2b2b;
-}
-
-#pm_composer .composer header .pm_button {
-    color: #8cc63f; 
-}
-
-#pm_composer .composer footer .pm_button.primary {
-    background: #8cc63f;
-}
-
-/* Notifications */
-body .cg-notify-message.notification-success {
-    background-color: #8cc63f;
-    border-color: #8cc63f;
-}
-
-/* Tootips */
-
-/*
-div.tooltip.inner {
-    background: #2c2b2b !important;
-}*/
-
-/* Mobile */
-
-header#pm_header-mobile {
-    background: #1a1a1a;
-}
-
-body.mobileMode #pm_sidebar section.sidebar {
-    background: #2c2b2b;
-}
-
-body.mobileMode #pm_sidebar section.sidebar .pm_button.round .fa {
-    color: #8cc63f;
-}
-
-header#pm_header-mobile a.compose {
-    color: #8cc63f;
-}
-
-body.mobileMode #body #pm_main .fa-check-square, body.mobileMode #body #pm_main .fa-square-o {
-    color: #8cc63f;
-}
\ No newline at end of file
diff --git a/Themes/v3.5.16/blue_and_orange/blue_and_orange.css b/Themes/v3.5.16/blue_and_orange/blue_and_orange.css
deleted file mode 100644
index 9111cf5..0000000
--- a/Themes/v3.5.16/blue_and_orange/blue_and_orange.css
+++ /dev/null
@@ -1,342 +0,0 @@
-/* =========================================== *
- * BLUE AND ORANGE 3.5.16 THEME
- * Author: Cristiano Almeida
- * Website: www.csalmeida.com
- * Tweets @_csalmeida
- * =========================================== */
-header#pm_header-desktop {
-  background: #0F4C5C;
-}
-
-header#pm_header-desktop ul.navigation {
-  background: #0F4C5C;
-}
-
-header#pm_header-desktop ul.navigation > li > a {
-  color: #fff;
-}
-
-header#pm_header-desktop ul.navigation > li > a:hover {
-  color: #ED7D3A;
-}
-
-header#pm_header-desktop ul.navigation > li > a > span .fa {
-  color: #fff;
-}
-
-header#pm_header-desktop ul.navigation > li > a > span .fa {
-  color: #fff;
-}
-
-header#pm_header-desktop ul.navigation > li.active {
-  box-shadow: 0 6px 0 0 #ED7D3A inset;
-  color: #ED7D3A;
-}
-
-header#pm_header-desktop ul.navigation > li:hover {
-  box-shadow: 0 6px 0 0 #ED7D3A inset;
-  color: #ED7D3A;
-  border-radius: 0px;
-}
-
-header#pm_header-desktop ul.navigation > li .pm_dropdown .user b, header#pm_header-desktop ul.navigation > li .pm_dropdown .user strong, html.protonmail .help {
-  color: #0d0d0d !important;
-}
-
-header#pm_header-desktop ul.navigation > li .pm_dropdown .user b:hover, header#pm_header-desktop ul.navigation > li .pm_dropdown .user strong:hover, html.protonmail .help:hover {
-  color: #0d0d0d;
-}
-
-header#pm_header-desktop ul.navigation > li .pm_dropdown .pm_button.primary {
-  background: #0F4C5C !important;
-  color: #fff !important;
-}
-
-header#pm_header-desktop ul.navigation > li .pm_dropdown .pm_button.primary:hover {
-  background: #ED7D3A !important;
-  border-color: #ED7D3A;
-  color: #fff !important;
-}
-
-form.searchForm fieldset {
-  background: #0A353F !important;
-  border-radius: 2px;
-}
-
-form.searchForm fieldset input.query {
-  background: #0A353F !important;
-  color: #fff !important;
-  border-radius: 2px;
-}
-
-form.searchForm fieldset #closeAdvSearch, form.searchForm fieldset button[type=submit] {
-  color: #fff;
-}
-
-form.searchForm fieldset #closeAdvSearch:hover, form.searchForm fieldset button[type=submit]:hover {
-  color: #ED7D3A;
-}
-
-form.searchForm fieldset button[type=button] {
-  color: #fff;
-  border-radius: 2px;
-}
-
-form.searchForm fieldset button[type=button]:hover {
-  background: #0A353F;
-  color: #ED7D3A;
-}
-
-form.searchForm #advancedSearchDropdown {
-  border-radius: 2px;
-}
-
-form.searchForm.adv fieldset {
-  border-radius: 2px 2px 0 0;
-}
-
-.pm_button.primary {
-  background: #0F4C5C;
-  border-color: #0F4C5C;
-  color: #fff;
-}
-
-.pm_button.primary:hover {
-  background: #ED7D3A;
-  border-color: #ED7D3A;
-  color: #fff;
-}
-
-.pm_button.primary:active, .pm_button.primary:focus {
-  background: #0F4C5C;
-  border-color: #0F4C5C;
-  color: #fff;
-}
-
-header#pm_header-desktop a.logo {
-  background-color: #0F4C5C;
-}
-
-body section.sidebar {
-  background: #0F4C5C;
-}
-
-body section.sidebar a.compose {
-  background: #ED7D3A;
-  color: #fff;
-}
-
-body section.sidebar a.compose:hover {
-  background: #fff;
-  border-color: #fff;
-  color: #0F4C5C;
-}
-
-body section.sidebar ul.menu li a {
-  color: #fff;
-}
-
-body section.sidebar ul.menu li a:hover {
-  color: #ED7D3A;
-}
-
-body section.sidebar ul.menu li.active a, body section.sidebar ul.menu li.active a {
-  color: #fff;
-}
-
-body section.sidebar ul.menu li.active a i.fa, body section.sidebar ul.menu li.active a i.fa:hover {
-  color: #ED7D3A !important;
-  opacity: 1;
-}
-
-body section.sidebar ul.menu li a .fa-repeat {
-  color: #fff;
-  opacity: 1;
-}
-
-body section.sidebar ul.menu li a i.fa {
-  color: #fff;
-  opacity: 0.5;
-}
-
-body section.sidebar ul.menu li a i.fa:hover, body section.sidebar ul.menu li a:hover i.fa {
-  color: #fff;
-  opacity: 1;
-}
-
-body section.sidebar ul.menu li a em {
-  color: #fff;
-  opacity: 0.5;
-}
-
-body section.sidebar div.labels ul li a {
-  color: #fff;
-  opacity: 0.5;
-}
-
-body section.sidebar div.labels ul li a:hover {
-  color: #fff;
-  opacity: 1;
-}
-
-body section.sidebar div.footer div.link a, body section.sidebar a.version {
-  color: #fff;
-  opacity: 0.5;
-}
-
-body section.sidebar div.footer div.link a:hover, body section.sidebar a.version:hover {
-  color: #ED7D3A;
-  opacity: 1;
-}
-
-body section.sidebar div.footer div.storage strong {
-  color: #fff;
-  opacity: 0.5;
-}
-
-body section.sidebar div.footer .bar em {
-  background: #ED7D3A;
-  height: 3px;
-}
-
-body section.sidebar div.footer .bar {
-  background: #fff;
-  height: 3px;
-}
-
-.pm_buttons, .pm_buttons a {
-  color: #0F4C5C;
-}
-
-.conversation.marked::before {
-  background: #ED7D3A;
-  width: 5px;
-}
-
-#pm_composer .composer header {
-  background: #0F4C5C;
-  color: #fff;
-}
-
-p a {
-  color: #ED7D3A;
-}
-
-#pm_composer .composer footer .pm_button {
-  background: #fff;
-  color: #0F4C5C;
-}
-
-#pm_composer .composer footer .pm_button:hover {
-  background: #fff;
-  color: #0F4C5C;
-}
-
-#pm_composer .composer footer .pm_button.primary {
-  background: #0F4C5C;
-  color: #fff;
-}
-
-#pm_composer .composer footer .pm_button.primary:hover {
-  background: #ED7D3A;
-  color: #fff;
-}
-
-#pm_settings .pm_tabs {
-  background: #e6eaf0;
-}
-
-#pm_settings .pm_tabs li a.pm_button {
-  color: #0F4C5C;
-  border-color: #e6eaf0;
-}
-
-#pm_settings .pm_tabs li a.pm_button:hover {
-  color: #ED7D3A;
-}
-
-#pm_settings .pm_tabs li.active a.pm_button {
-  color: #ED7D3A;
-}
-
-.pm_button.link {
-  color: #ED7D3A;
-}
-
-.pm_toggle.off .off, .pm_toggle.on .on {
-  background: #0F4C5C;
-  color: #fff;
-}
-
-.alert.alert-info {
-  background: #e6eaf0;
-  color: #000;
-}
-
-html.protonmail .text-purple {
-  color: #ED7D3A;
-}
-
-#pm_settings .bar em {
-  background: #ED7D3A;
-  height: 4px;
-}
-
-#pm_settings .bar {
-  background: #0F4C5C;
-  opacity: 0.5;
-  height: 4px;
-}
-
-#plans .plans .plan h3 {
-  background: #0F4C5C;
-  color: #fff;
-}
-
-#plans .plans .plan.plus-plan h3 span, #plans .plans .plan.visionary-plan h3 span, #plans .plans .plan.visionary-plan header {
-  color: #fff;
-}
-
-#plans .plans .plan footer .cycle strong {
-  color: #ED7D3A;
-}
-
-#plans .plans .plan footer .cycle .discount {
-  border-color: transparent #ED7D3A transparent transparent;
-}
-
-#plans .plans .plan footer .cycle .discount span {
-  color: #fff;
-}
-
-.pm_modal .modal-dialog {
-  border-color: #0F4C5C;
-}
-
-.pm_modal .modal-dialog .close {
-  color: #fff;
-  background: #0F4C5C;
-}
-
-.pm_badge {
-  color: #fff;
-}
-
-.pm_badge.primary {
-  background: #0F4C5C;
-  color: #fff;
-}
-
-.pm_badge.success {
-  background: #ED7D3A;
-  color: #fff;
-}
-
-.pm_table table th a, .pm_table table th .fa {
-  color: #ED7D3A;
-}
-
-body .cg-notify-message.notification-success {
-  background-color: #ED7D3A;
-  color: #fff;
-}
diff --git a/Themes/v3.5.16/blue_and_orange/blue_and_orange.min.css b/Themes/v3.5.16/blue_and_orange/blue_and_orange.min.css
deleted file mode 100644
index d49061f..0000000
--- a/Themes/v3.5.16/blue_and_orange/blue_and_orange.min.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/* =========================================== *
- * BLUE AND ORANGE 3.5.16 THEME
- * Author: Cristiano Almeida
- * Website: www.csalmeida.com
- * Tweets @_csalmeida
- * =========================================== */
-header#pm_header-desktop,header#pm_header-desktop ul.navigation{background:#0F4C5C}header#pm_header-desktop ul.navigation>li>a{color:#fff}header#pm_header-desktop ul.navigation>li>a:hover{color:#ED7D3A}header#pm_header-desktop ul.navigation>li>a>span .fa{color:#fff}header#pm_header-desktop ul.navigation>li.active,header#pm_header-desktop ul.navigation>li:hover{box-shadow:0 6px 0 0 #ED7D3A inset;color:#ED7D3A}header#pm_header-desktop ul.navigation>li:hover{border-radius:0}header#pm_header-desktop ul.navigation>li .pm_dropdown .user b,header#pm_header-desktop ul.navigation>li .pm_dropdown .user strong,html.protonmail .help{color:#0d0d0d!important}header#pm_header-desktop ul.navigation>li .pm_dropdown .user b:hover,header#pm_header-desktop ul.navigation>li .pm_dropdown .user strong:hover,html.protonmail .help:hover{color:#0d0d0d}header#pm_header-desktop ul.navigation>li .pm_dropdown .pm_button.primary{background:#0F4C5C!important;color:#fff!important}header#pm_header-desktop ul.navigation>li .pm_dropdown .pm_button.primary:hover{background:#ED7D3A!important;border-color:#ED7D3A;color:#fff!important}form.searchForm fieldset,form.searchForm fieldset input.query{background:#0A353F!important;border-radius:2px}form.searchForm fieldset input.query{color:#fff!important}form.searchForm fieldset #closeAdvSearch,form.searchForm fieldset button[type=submit]{color:#fff}form.searchForm fieldset #closeAdvSearch:hover,form.searchForm fieldset button[type=submit]:hover{color:#ED7D3A}form.searchForm fieldset button[type=button]{color:#fff;border-radius:2px}form.searchForm fieldset button[type=button]:hover{background:#0A353F;color:#ED7D3A}form.searchForm #advancedSearchDropdown{border-radius:2px}form.searchForm.adv fieldset{border-radius:2px 2px 0 0}.pm_button.primary{background:#0F4C5C;border-color:#0F4C5C;color:#fff}.pm_button.primary:hover{background:#ED7D3A;border-color:#ED7D3A;color:#fff}.pm_button.primary:active,.pm_button.primary:focus{background:#0F4C5C;border-color:#0F4C5C;color:#fff}header#pm_header-desktop a.logo{background-color:#0F4C5C}body section.sidebar{background:#0F4C5C}body section.sidebar a.compose{background:#ED7D3A;color:#fff}body section.sidebar a.compose:hover{background:#fff;border-color:#fff;color:#0F4C5C}body section.sidebar ul.menu li a{color:#fff}body section.sidebar ul.menu li a:hover{color:#ED7D3A}body section.sidebar ul.menu li.active a{color:#fff}body section.sidebar ul.menu li.active a i.fa,body section.sidebar ul.menu li.active a i.fa:hover{color:#ED7D3A!important;opacity:1}body section.sidebar ul.menu li a .fa-repeat{color:#fff;opacity:1}body section.sidebar ul.menu li a i.fa{color:#fff;opacity:.5}body section.sidebar ul.menu li a i.fa:hover,body section.sidebar ul.menu li a:hover i.fa{color:#fff;opacity:1}body section.sidebar div.labels ul li a,body section.sidebar ul.menu li a em{color:#fff;opacity:.5}body section.sidebar div.labels ul li a:hover{color:#fff;opacity:1}body section.sidebar a.version,body section.sidebar div.footer div.link a{color:#fff;opacity:.5}body section.sidebar a.version:hover,body section.sidebar div.footer div.link a:hover{color:#ED7D3A;opacity:1}body section.sidebar div.footer div.storage strong{color:#fff;opacity:.5}body section.sidebar div.footer .bar em{background:#ED7D3A;height:3px}body section.sidebar div.footer .bar{background:#fff;height:3px}.pm_buttons,.pm_buttons a{color:#0F4C5C}.conversation.marked::before{background:#ED7D3A;width:5px}#pm_composer .composer header{background:#0F4C5C;color:#fff}p a{color:#ED7D3A}#pm_composer .composer footer .pm_button,#pm_composer .composer footer .pm_button:hover{background:#fff;color:#0F4C5C}#pm_composer .composer footer .pm_button.primary{background:#0F4C5C;color:#fff}#pm_composer .composer footer .pm_button.primary:hover{background:#ED7D3A;color:#fff}#pm_settings .pm_tabs{background:#e6eaf0}#pm_settings .pm_tabs li a.pm_button{color:#0F4C5C;border-color:#e6eaf0}#pm_settings .pm_tabs li a.pm_button:hover,#pm_settings .pm_tabs li.active a.pm_button,.pm_button.link{color:#ED7D3A}.pm_toggle.off .off,.pm_toggle.on .on{background:#0F4C5C;color:#fff}.alert.alert-info{background:#e6eaf0;color:#000}html.protonmail .text-purple{color:#ED7D3A}#pm_settings .bar em{background:#ED7D3A;height:4px}#pm_settings .bar{background:#0F4C5C;opacity:.5;height:4px}#plans .plans .plan h3{background:#0F4C5C;color:#fff}#plans .plans .plan.plus-plan h3 span,#plans .plans .plan.visionary-plan h3 span,#plans .plans .plan.visionary-plan header{color:#fff}#plans .plans .plan footer .cycle strong{color:#ED7D3A}#plans .plans .plan footer .cycle .discount{border-color:transparent #ED7D3A transparent transparent}#plans .plans .plan footer .cycle .discount span{color:#fff}.pm_modal .modal-dialog{border-color:#0F4C5C}.pm_modal .modal-dialog .close{color:#fff;background:#0F4C5C}.pm_badge{color:#fff}.pm_badge.primary{background:#0F4C5C;color:#fff}.pm_badge.success{background:#ED7D3A;color:#fff}.pm_table table th .fa,.pm_table table th a{color:#ED7D3A}body .cg-notify-message.notification-success{background-color:#ED7D3A;color:#fff}
diff --git a/Themes/v3.5.16/dark_bubble_gum/dark_bubble_gum.css b/Themes/v3.5.16/dark_bubble_gum/dark_bubble_gum.css
deleted file mode 100644
index abb04ee..0000000
--- a/Themes/v3.5.16/dark_bubble_gum/dark_bubble_gum.css
+++ /dev/null
@@ -1,342 +0,0 @@
-/* =========================================== *
- * DARK BUBBLE GUM 3.5.16 THEME
- * Author: Cristiano Almeida
- * Website: www.csalmeida.com
- * Tweets @_csalmeida
- * =========================================== */
-header#pm_header-desktop {
-  background: #0d0d0d;
-}
-
-header#pm_header-desktop ul.navigation {
-  background: #0d0d0d;
-}
-
-header#pm_header-desktop ul.navigation > li > a {
-  color: #fff;
-}
-
-header#pm_header-desktop ul.navigation > li > a:hover {
-  color: #EF2D56;
-}
-
-header#pm_header-desktop ul.navigation > li > a > span .fa {
-  color: #fff;
-}
-
-header#pm_header-desktop ul.navigation > li > a > span .fa {
-  color: #fff;
-}
-
-header#pm_header-desktop ul.navigation > li.active {
-  box-shadow: 0 6px 0 0 #EF2D56 inset;
-  color: #EF2D56;
-}
-
-header#pm_header-desktop ul.navigation > li:hover {
-  box-shadow: 0 6px 0 0 #EF2D56 inset;
-  color: #EF2D56;
-  border-radius: 0px;
-}
-
-header#pm_header-desktop ul.navigation > li .pm_dropdown .user b, header#pm_header-desktop ul.navigation > li .pm_dropdown .user strong, html.protonmail .help {
-  color: #0d0d0d !important;
-}
-
-header#pm_header-desktop ul.navigation > li .pm_dropdown .user b:hover, header#pm_header-desktop ul.navigation > li .pm_dropdown .user strong:hover, html.protonmail .help:hover {
-  color: #0d0d0d;
-}
-
-header#pm_header-desktop ul.navigation > li .pm_dropdown .pm_button.primary {
-  background: #0d0d0d !important;
-  color: #fff !important;
-}
-
-header#pm_header-desktop ul.navigation > li .pm_dropdown .pm_button.primary:hover {
-  background: #EF2D56 !important;
-  border-color: #EF2D56;
-  color: #fff !important;
-}
-
-form.searchForm fieldset {
-  background: #000 !important;
-  border-radius: 2px;
-}
-
-form.searchForm fieldset input.query {
-  background: #000 !important;
-  color: #fff !important;
-  border-radius: 2px;
-}
-
-form.searchForm fieldset #closeAdvSearch, form.searchForm fieldset button[type=submit] {
-  color: #fff;
-}
-
-form.searchForm fieldset #closeAdvSearch:hover, form.searchForm fieldset button[type=submit]:hover {
-  color: #EF2D56;
-}
-
-form.searchForm fieldset button[type=button] {
-  color: #fff;
-  border-radius: 2px;
-}
-
-form.searchForm fieldset button[type=button]:hover {
-  background: #000;
-  color: #EF2D56;
-}
-
-form.searchForm #advancedSearchDropdown {
-  border-radius: 2px;
-}
-
-form.searchForm.adv fieldset {
-  border-radius: 2px 2px 0 0;
-}
-
-.pm_button.primary {
-  background: #0d0d0d;
-  border-color: #0d0d0d;
-  color: #fff;
-}
-
-.pm_button.primary:hover {
-  background: #EF2D56;
-  border-color: #EF2D56;
-  color: #fff;
-}
-
-.pm_button.primary:active, .pm_button.primary:focus {
-  background: #0d0d0d;
-  border-color: #0d0d0d;
-  color: #fff;
-}
-
-header#pm_header-desktop a.logo {
-  background-color: #0d0d0d;
-}
-
-body section.sidebar {
-  background: #0d0d0d;
-}
-
-body section.sidebar a.compose {
-  background: #EF2D56;
-  color: #fff;
-}
-
-body section.sidebar a.compose:hover {
-  background: #fff;
-  border-color: #fff;
-  color: #0d0d0d;
-}
-
-body section.sidebar ul.menu li a {
-  color: #fff;
-}
-
-body section.sidebar ul.menu li a:hover {
-  color: #EF2D56;
-}
-
-body section.sidebar ul.menu li.active a, body section.sidebar ul.menu li.active a {
-  color: #fff;
-}
-
-body section.sidebar ul.menu li.active a i.fa, body section.sidebar ul.menu li.active a i.fa:hover {
-  color: #EF2D56 !important;
-  opacity: 1;
-}
-
-body section.sidebar ul.menu li a .fa-repeat {
-  color: #fff;
-  opacity: 1;
-}
-
-body section.sidebar ul.menu li a i.fa {
-  color: #fff;
-  opacity: 0.5;
-}
-
-body section.sidebar ul.menu li a i.fa:hover, body section.sidebar ul.menu li a:hover i.fa {
-  color: #fff;
-  opacity: 1;
-}
-
-body section.sidebar ul.menu li a em {
-  color: #fff;
-  opacity: 0.5;
-}
-
-body section.sidebar div.labels ul li a {
-  color: #fff;
-  opacity: 0.5;
-}
-
-body section.sidebar div.labels ul li a:hover {
-  color: #fff;
-  opacity: 1;
-}
-
-body section.sidebar div.footer div.link a, body section.sidebar a.version {
-  color: #fff;
-  opacity: 0.5;
-}
-
-body section.sidebar div.footer div.link a:hover, body section.sidebar a.version:hover {
-  color: #EF2D56;
-  opacity: 1;
-}
-
-body section.sidebar div.footer div.storage strong {
-  color: #fff;
-  opacity: 0.5;
-}
-
-body section.sidebar div.footer .bar em {
-  background: #EF2D56;
-  height: 3px;
-}
-
-body section.sidebar div.footer .bar {
-  background: #fff;
-  height: 3px;
-}
-
-.pm_buttons, .pm_buttons a {
-  color: #0d0d0d;
-}
-
-.conversation.marked::before {
-  background: #EF2D56;
-  width: 5px;
-}
-
-#pm_composer .composer header {
-  background: #0d0d0d;
-  color: #fff;
-}
-
-p a {
-  color: #EF2D56;
-}
-
-#pm_composer .composer footer .pm_button {
-  background: #fff;
-  color: #0d0d0d;
-}
-
-#pm_composer .composer footer .pm_button:hover {
-  background: #fff;
-  color: #0d0d0d;
-}
-
-#pm_composer .composer footer .pm_button.primary {
-  background: #0d0d0d;
-  color: #fff;
-}
-
-#pm_composer .composer footer .pm_button.primary:hover {
-  background: #EF2D56;
-  color: #fff;
-}
-
-#pm_settings .pm_tabs {
-  background: #e6eaf0;
-}
-
-#pm_settings .pm_tabs li a.pm_button {
-  color: #0d0d0d;
-  border-color: #e6eaf0;
-}
-
-#pm_settings .pm_tabs li a.pm_button:hover {
-  color: #EF2D56;
-}
-
-#pm_settings .pm_tabs li.active a.pm_button {
-  color: #EF2D56;
-}
-
-.pm_button.link {
-  color: #EF2D56;
-}
-
-.pm_toggle.off .off, .pm_toggle.on .on {
-  background: #0d0d0d;
-  color: #fff;
-}
-
-.alert.alert-info {
-  background: #e6eaf0;
-  color: #000;
-}
-
-html.protonmail .text-purple {
-  color: #EF2D56;
-}
-
-#pm_settings .bar em {
-  background: #EF2D56;
-  height: 4px;
-}
-
-#pm_settings .bar {
-  background: #0d0d0d;
-  opacity: 0.5;
-  height: 4px;
-}
-
-#plans .plans .plan h3 {
-  background: #0d0d0d;
-  color: #fff;
-}
-
-#plans .plans .plan.plus-plan h3 span, #plans .plans .plan.visionary-plan h3 span, #plans .plans .plan.visionary-plan header {
-  color: #fff;
-}
-
-#plans .plans .plan footer .cycle strong {
-  color: #EF2D56;
-}
-
-#plans .plans .plan footer .cycle .discount {
-  border-color: transparent #EF2D56 transparent transparent;
-}
-
-#plans .plans .plan footer .cycle .discount span {
-  color: #fff;
-}
-
-.pm_modal .modal-dialog {
-  border-color: #0d0d0d;
-}
-
-.pm_modal .modal-dialog .close {
-  color: #fff;
-  background: #0d0d0d;
-}
-
-.pm_badge {
-  color: #fff;
-}
-
-.pm_badge.primary {
-  background: #0d0d0d;
-  color: #fff;
-}
-
-.pm_badge.success {
-  background: #EF2D56;
-  color: #fff;
-}
-
-.pm_table table th a, .pm_table table th .fa {
-  color: #EF2D56;
-}
-
-body .cg-notify-message.notification-success {
-  background-color: #EF2D56;
-  color: #fff;
-}
diff --git a/Themes/v3.5.16/dark_bubble_gum/dark_bubble_gum.min.css b/Themes/v3.5.16/dark_bubble_gum/dark_bubble_gum.min.css
deleted file mode 100644
index d50f668..0000000
--- a/Themes/v3.5.16/dark_bubble_gum/dark_bubble_gum.min.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/* =========================================== *
- * DARK BUBBLE GUM 3.5.16 THEME
- * Author: Cristiano Almeida
- * Website: www.csalmeida.com
- * Tweets @_csalmeida
- * =========================================== */
-header#pm_header-desktop,header#pm_header-desktop ul.navigation{background:#0d0d0d}header#pm_header-desktop ul.navigation>li>a{color:#fff}header#pm_header-desktop ul.navigation>li>a:hover{color:#EF2D56}header#pm_header-desktop ul.navigation>li>a>span .fa{color:#fff}header#pm_header-desktop ul.navigation>li.active,header#pm_header-desktop ul.navigation>li:hover{box-shadow:0 6px 0 0 #EF2D56 inset;color:#EF2D56}header#pm_header-desktop ul.navigation>li:hover{border-radius:0}header#pm_header-desktop ul.navigation>li .pm_dropdown .user b,header#pm_header-desktop ul.navigation>li .pm_dropdown .user strong,html.protonmail .help{color:#0d0d0d!important}header#pm_header-desktop ul.navigation>li .pm_dropdown .user b:hover,header#pm_header-desktop ul.navigation>li .pm_dropdown .user strong:hover,html.protonmail .help:hover{color:#0d0d0d}header#pm_header-desktop ul.navigation>li .pm_dropdown .pm_button.primary{background:#0d0d0d!important;color:#fff!important}header#pm_header-desktop ul.navigation>li .pm_dropdown .pm_button.primary:hover{background:#EF2D56!important;border-color:#EF2D56;color:#fff!important}form.searchForm fieldset,form.searchForm fieldset input.query{background:#000!important;border-radius:2px}form.searchForm fieldset input.query{color:#fff!important}form.searchForm fieldset #closeAdvSearch,form.searchForm fieldset button[type=submit]{color:#fff}form.searchForm fieldset #closeAdvSearch:hover,form.searchForm fieldset button[type=submit]:hover{color:#EF2D56}form.searchForm fieldset button[type=button]{color:#fff;border-radius:2px}form.searchForm fieldset button[type=button]:hover{background:#000;color:#EF2D56}form.searchForm #advancedSearchDropdown{border-radius:2px}form.searchForm.adv fieldset{border-radius:2px 2px 0 0}.pm_button.primary{background:#0d0d0d;border-color:#0d0d0d;color:#fff}.pm_button.primary:hover{background:#EF2D56;border-color:#EF2D56;color:#fff}.pm_button.primary:active,.pm_button.primary:focus{background:#0d0d0d;border-color:#0d0d0d;color:#fff}header#pm_header-desktop a.logo{background-color:#0d0d0d}body section.sidebar{background:#0d0d0d}body section.sidebar a.compose{background:#EF2D56;color:#fff}body section.sidebar a.compose:hover{background:#fff;border-color:#fff;color:#0d0d0d}body section.sidebar ul.menu li a{color:#fff}body section.sidebar ul.menu li a:hover{color:#EF2D56}body section.sidebar ul.menu li.active a{color:#fff}body section.sidebar ul.menu li.active a i.fa,body section.sidebar ul.menu li.active a i.fa:hover{color:#EF2D56!important;opacity:1}body section.sidebar ul.menu li a .fa-repeat{color:#fff;opacity:1}body section.sidebar ul.menu li a i.fa{color:#fff;opacity:.5}body section.sidebar ul.menu li a i.fa:hover,body section.sidebar ul.menu li a:hover i.fa{color:#fff;opacity:1}body section.sidebar div.labels ul li a,body section.sidebar ul.menu li a em{color:#fff;opacity:.5}body section.sidebar div.labels ul li a:hover{color:#fff;opacity:1}body section.sidebar a.version,body section.sidebar div.footer div.link a{color:#fff;opacity:.5}body section.sidebar a.version:hover,body section.sidebar div.footer div.link a:hover{color:#EF2D56;opacity:1}body section.sidebar div.footer div.storage strong{color:#fff;opacity:.5}body section.sidebar div.footer .bar em{background:#EF2D56;height:3px}body section.sidebar div.footer .bar{background:#fff;height:3px}.pm_buttons,.pm_buttons a{color:#0d0d0d}.conversation.marked::before{background:#EF2D56;width:5px}#pm_composer .composer header{background:#0d0d0d;color:#fff}p a{color:#EF2D56}#pm_composer .composer footer .pm_button,#pm_composer .composer footer .pm_button:hover{background:#fff;color:#0d0d0d}#pm_composer .composer footer .pm_button.primary{background:#0d0d0d;color:#fff}#pm_composer .composer footer .pm_button.primary:hover{background:#EF2D56;color:#fff}#pm_settings .pm_tabs{background:#e6eaf0}#pm_settings .pm_tabs li a.pm_button{color:#0d0d0d;border-color:#e6eaf0}#pm_settings .pm_tabs li a.pm_button:hover,#pm_settings .pm_tabs li.active a.pm_button,.pm_button.link{color:#EF2D56}.pm_toggle.off .off,.pm_toggle.on .on{background:#0d0d0d;color:#fff}.alert.alert-info{background:#e6eaf0;color:#000}html.protonmail .text-purple{color:#EF2D56}#pm_settings .bar em{background:#EF2D56;height:4px}#pm_settings .bar{background:#0d0d0d;opacity:.5;height:4px}#plans .plans .plan h3{background:#0d0d0d;color:#fff}#plans .plans .plan.plus-plan h3 span,#plans .plans .plan.visionary-plan h3 span,#plans .plans .plan.visionary-plan header{color:#fff}#plans .plans .plan footer .cycle strong{color:#EF2D56}#plans .plans .plan footer .cycle .discount{border-color:transparent #EF2D56 transparent transparent}#plans .plans .plan footer .cycle .discount span{color:#fff}.pm_modal .modal-dialog{border-color:#0d0d0d}.pm_modal .modal-dialog .close{color:#fff;background:#0d0d0d}.pm_badge{color:#fff}.pm_badge.primary{background:#0d0d0d;color:#fff}.pm_badge.success{background:#EF2D56;color:#fff}.pm_table table th .fa,.pm_table table th a{color:#EF2D56}body .cg-notify-message.notification-success{background-color:#EF2D56;color:#fff}
diff --git a/Themes/v3.5.16/green_lume/green_lume.css b/Themes/v3.5.16/green_lume/green_lume.css
deleted file mode 100644
index cbbe36e..0000000
--- a/Themes/v3.5.16/green_lume/green_lume.css
+++ /dev/null
@@ -1,342 +0,0 @@
- /* =========================================== *
-  * GREEN LUME 3.5.16 THEME
-  * Author: Cristiano Almeida
-  * Website: www.csalmeida.com
-  * Tweets @_csalmeida
-  * =========================================== */
- header#pm_header-desktop {
-   background: #0d0d0d;
- }
-
- header#pm_header-desktop ul.navigation {
-   background: #0d0d0d;
- }
-
- header#pm_header-desktop ul.navigation > li > a {
-   color: #fff;
- }
-
- header#pm_header-desktop ul.navigation > li > a:hover {
-   color: #2FBF71;
- }
-
- header#pm_header-desktop ul.navigation > li > a > span .fa {
-   color: #fff;
- }
-
- header#pm_header-desktop ul.navigation > li > a > span .fa {
-   color: #fff;
- }
-
- header#pm_header-desktop ul.navigation > li.active {
-   box-shadow: 0 6px 0 0 #2FBF71 inset;
-   color: #2FBF71;
- }
-
- header#pm_header-desktop ul.navigation > li:hover {
-   box-shadow: 0 6px 0 0 #2FBF71 inset;
-   color: #2FBF71;
-   border-radius: 0px;
- }
-
- header#pm_header-desktop ul.navigation > li .pm_dropdown .user b, header#pm_header-desktop ul.navigation > li .pm_dropdown .user strong, html.protonmail .help {
-   color: #0d0d0d !important;
- }
-
- header#pm_header-desktop ul.navigation > li .pm_dropdown .user b:hover, header#pm_header-desktop ul.navigation > li .pm_dropdown .user strong:hover, html.protonmail .help:hover {
-   color: #0d0d0d;
- }
-
- header#pm_header-desktop ul.navigation > li .pm_dropdown .pm_button.primary {
-   background: #0d0d0d !important;
-   color: #fff !important;
- }
-
- header#pm_header-desktop ul.navigation > li .pm_dropdown .pm_button.primary:hover {
-   background: #2FBF71 !important;
-   border-color: #2FBF71;
-   color: #fff !important;
- }
-
- form.searchForm fieldset {
-   background: #000 !important;
-   border-radius: 2px;
- }
-
- form.searchForm fieldset input.query {
-   background: #000 !important;
-   color: #fff !important;
-   border-radius: 2px;
- }
-
- form.searchForm fieldset #closeAdvSearch, form.searchForm fieldset button[type=submit] {
-   color: #fff;
- }
-
- form.searchForm fieldset #closeAdvSearch:hover, form.searchForm fieldset button[type=submit]:hover {
-   color: #2FBF71;
- }
-
- form.searchForm fieldset button[type=button] {
-   color: #fff;
-   border-radius: 2px;
- }
-
- form.searchForm fieldset button[type=button]:hover {
-   background: #000;
-   color: #2FBF71;
- }
-
- form.searchForm #advancedSearchDropdown {
-   border-radius: 2px;
- }
-
- form.searchForm.adv fieldset {
-   border-radius: 2px 2px 0 0;
- }
-
- .pm_button.primary {
-   background: #0d0d0d;
-   border-color: #0d0d0d;
-   color: #fff;
- }
-
- .pm_button.primary:hover {
-   background: #2FBF71;
-   border-color: #2FBF71;
-   color: #fff;
- }
-
- .pm_button.primary:active, .pm_button.primary:focus {
-   background: #0d0d0d;
-   border-color: #0d0d0d;
-   color: #fff;
- }
-
- header#pm_header-desktop a.logo {
-   background-color: #0d0d0d;
- }
-
- body section.sidebar {
-   background: #0d0d0d;
- }
-
- body section.sidebar a.compose {
-   background: #2FBF71;
-   color: #fff;
- }
-
- body section.sidebar a.compose:hover {
-   background: #fff;
-   border-color: #fff;
-   color: #0d0d0d;
- }
-
- body section.sidebar ul.menu li a {
-   color: #fff;
- }
-
- body section.sidebar ul.menu li a:hover {
-   color: #2FBF71;
- }
-
- body section.sidebar ul.menu li.active a, body section.sidebar ul.menu li.active a {
-   color: #fff;
- }
-
- body section.sidebar ul.menu li.active a i.fa, body section.sidebar ul.menu li.active a i.fa:hover {
-   color: #2FBF71 !important;
-   opacity: 1;
- }
-
- body section.sidebar ul.menu li a .fa-repeat {
-   color: #fff;
-   opacity: 1;
- }
-
- body section.sidebar ul.menu li a i.fa {
-   color: #fff;
-   opacity: 0.5;
- }
-
- body section.sidebar ul.menu li a i.fa:hover, body section.sidebar ul.menu li a:hover i.fa {
-   color: #fff;
-   opacity: 1;
- }
-
- body section.sidebar ul.menu li a em {
-   color: #fff;
-   opacity: 0.5;
- }
-
- body section.sidebar div.labels ul li a {
-   color: #fff;
-   opacity: 0.5;
- }
-
- body section.sidebar div.labels ul li a:hover {
-   color: #fff;
-   opacity: 1;
- }
-
- body section.sidebar div.footer div.link a, body section.sidebar a.version {
-   color: #fff;
-   opacity: 0.5;
- }
-
- body section.sidebar div.footer div.link a:hover, body section.sidebar a.version:hover {
-   color: #2FBF71;
-   opacity: 1;
- }
-
- body section.sidebar div.footer div.storage strong {
-   color: #fff;
-   opacity: 0.5;
- }
-
- body section.sidebar div.footer .bar em {
-   background: #2FBF71;
-   height: 3px;
- }
-
- body section.sidebar div.footer .bar {
-   background: #fff;
-   height: 3px;
- }
-
- .pm_buttons, .pm_buttons a {
-   color: #0d0d0d;
- }
-
- .conversation.marked::before {
-   background: #2FBF71;
-   width: 5px;
- }
-
- #pm_composer .composer header {
-   background: #0d0d0d;
-   color: #fff;
- }
-
- p a {
-   color: #2FBF71;
- }
-
- #pm_composer .composer footer .pm_button {
-   background: #fff;
-   color: #0d0d0d;
- }
-
- #pm_composer .composer footer .pm_button:hover {
-   background: #fff;
-   color: #0d0d0d;
- }
-
- #pm_composer .composer footer .pm_button.primary {
-   background: #0d0d0d;
-   color: #fff;
- }
-
- #pm_composer .composer footer .pm_button.primary:hover {
-   background: #2FBF71;
-   color: #fff;
- }
-
- #pm_settings .pm_tabs {
-   background: #e6eaf0;
- }
-
- #pm_settings .pm_tabs li a.pm_button {
-   color: #0d0d0d;
-   border-color: #e6eaf0;
- }
-
- #pm_settings .pm_tabs li a.pm_button:hover {
-   color: #2FBF71;
- }
-
- #pm_settings .pm_tabs li.active a.pm_button {
-   color: #2FBF71;
- }
-
- .pm_button.link {
-   color: #2FBF71;
- }
-
- .pm_toggle.off .off, .pm_toggle.on .on {
-   background: #0d0d0d;
-   color: #fff;
- }
-
- .alert.alert-info {
-   background: #e6eaf0;
-   color: #000;
- }
-
- html.protonmail .text-purple {
-   color: #2FBF71;
- }
-
- #pm_settings .bar em {
-   background: #2FBF71;
-   height: 4px;
- }
-
- #pm_settings .bar {
-   background: #0d0d0d;
-   opacity: 0.5;
-   height: 4px;
- }
-
- #plans .plans .plan h3 {
-   background: #0d0d0d;
-   color: #fff;
- }
-
- #plans .plans .plan.plus-plan h3 span, #plans .plans .plan.visionary-plan h3 span, #plans .plans .plan.visionary-plan header {
-   color: #fff;
- }
-
- #plans .plans .plan footer .cycle strong {
-   color: #2FBF71;
- }
-
- #plans .plans .plan footer .cycle .discount {
-   border-color: transparent #2FBF71 transparent transparent;
- }
-
- #plans .plans .plan footer .cycle .discount span {
-   color: #fff;
- }
-
- .pm_modal .modal-dialog {
-   border-color: #0d0d0d;
- }
-
- .pm_modal .modal-dialog .close {
-   color: #fff;
-   background: #0d0d0d;
- }
-
- .pm_badge {
-   color: #fff;
- }
-
- .pm_badge.primary {
-   background: #0d0d0d;
-   color: #fff;
- }
-
- .pm_badge.success {
-   background: #2FBF71;
-   color: #fff;
- }
-
- .pm_table table th a, .pm_table table th .fa {
-   color: #2FBF71;
- }
-
- body .cg-notify-message.notification-success {
-   background-color: #2FBF71;
-   color: #fff;
- }
diff --git a/Themes/v3.5.16/green_lume/green_lume.min.css b/Themes/v3.5.16/green_lume/green_lume.min.css
deleted file mode 100644
index d54357a..0000000
--- a/Themes/v3.5.16/green_lume/green_lume.min.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/* =========================================== *
- * GREEN LUME 3.5.16 THEME
- * Author: Cristiano Almeida
- * Website: www.csalmeida.com
- * Tweets @_csalmeida
- * =========================================== */
-header#pm_header-desktop,header#pm_header-desktop ul.navigation{background:#0d0d0d}header#pm_header-desktop ul.navigation>li>a{color:#fff}header#pm_header-desktop ul.navigation>li>a:hover{color:#2FBF71}header#pm_header-desktop ul.navigation>li>a>span .fa{color:#fff}header#pm_header-desktop ul.navigation>li.active,header#pm_header-desktop ul.navigation>li:hover{box-shadow:0 6px 0 0 #2FBF71 inset;color:#2FBF71}header#pm_header-desktop ul.navigation>li:hover{border-radius:0}header#pm_header-desktop ul.navigation>li .pm_dropdown .user b,header#pm_header-desktop ul.navigation>li .pm_dropdown .user strong,html.protonmail .help{color:#0d0d0d!important}header#pm_header-desktop ul.navigation>li .pm_dropdown .user b:hover,header#pm_header-desktop ul.navigation>li .pm_dropdown .user strong:hover,html.protonmail .help:hover{color:#0d0d0d}header#pm_header-desktop ul.navigation>li .pm_dropdown .pm_button.primary{background:#0d0d0d!important;color:#fff!important}header#pm_header-desktop ul.navigation>li .pm_dropdown .pm_button.primary:hover{background:#2FBF71!important;border-color:#2FBF71;color:#fff!important}form.searchForm fieldset,form.searchForm fieldset input.query{background:#000!important;border-radius:2px}form.searchForm fieldset input.query{color:#fff!important}form.searchForm fieldset #closeAdvSearch,form.searchForm fieldset button[type=submit]{color:#fff}form.searchForm fieldset #closeAdvSearch:hover,form.searchForm fieldset button[type=submit]:hover{color:#2FBF71}form.searchForm fieldset button[type=button]{color:#fff;border-radius:2px}form.searchForm fieldset button[type=button]:hover{background:#000;color:#2FBF71}form.searchForm #advancedSearchDropdown{border-radius:2px}form.searchForm.adv fieldset{border-radius:2px 2px 0 0}.pm_button.primary{background:#0d0d0d;border-color:#0d0d0d;color:#fff}.pm_button.primary:hover{background:#2FBF71;border-color:#2FBF71;color:#fff}.pm_button.primary:active,.pm_button.primary:focus{background:#0d0d0d;border-color:#0d0d0d;color:#fff}header#pm_header-desktop a.logo{background-color:#0d0d0d}body section.sidebar{background:#0d0d0d}body section.sidebar a.compose{background:#2FBF71;color:#fff}body section.sidebar a.compose:hover{background:#fff;border-color:#fff;color:#0d0d0d}body section.sidebar ul.menu li a{color:#fff}body section.sidebar ul.menu li a:hover{color:#2FBF71}body section.sidebar ul.menu li.active a{color:#fff}body section.sidebar ul.menu li.active a i.fa,body section.sidebar ul.menu li.active a i.fa:hover{color:#2FBF71!important;opacity:1}body section.sidebar ul.menu li a .fa-repeat{color:#fff;opacity:1}body section.sidebar ul.menu li a i.fa{color:#fff;opacity:.5}body section.sidebar ul.menu li a i.fa:hover,body section.sidebar ul.menu li a:hover i.fa{color:#fff;opacity:1}body section.sidebar div.labels ul li a,body section.sidebar ul.menu li a em{color:#fff;opacity:.5}body section.sidebar div.labels ul li a:hover{color:#fff;opacity:1}body section.sidebar a.version,body section.sidebar div.footer div.link a{color:#fff;opacity:.5}body section.sidebar a.version:hover,body section.sidebar div.footer div.link a:hover{color:#2FBF71;opacity:1}body section.sidebar div.footer div.storage strong{color:#fff;opacity:.5}body section.sidebar div.footer .bar em{background:#2FBF71;height:3px}body section.sidebar div.footer .bar{background:#fff;height:3px}.pm_buttons,.pm_buttons a{color:#0d0d0d}.conversation.marked::before{background:#2FBF71;width:5px}#pm_composer .composer header{background:#0d0d0d;color:#fff}p a{color:#2FBF71}#pm_composer .composer footer .pm_button,#pm_composer .composer footer .pm_button:hover{background:#fff;color:#0d0d0d}#pm_composer .composer footer .pm_button.primary{background:#0d0d0d;color:#fff}#pm_composer .composer footer .pm_button.primary:hover{background:#2FBF71;color:#fff}#pm_settings .pm_tabs{background:#e6eaf0}#pm_settings .pm_tabs li a.pm_button{color:#0d0d0d;border-color:#e6eaf0}#pm_settings .pm_tabs li a.pm_button:hover,#pm_settings .pm_tabs li.active a.pm_button,.pm_button.link{color:#2FBF71}.pm_toggle.off .off,.pm_toggle.on .on{background:#0d0d0d;color:#fff}.alert.alert-info{background:#e6eaf0;color:#000}html.protonmail .text-purple{color:#2FBF71}#pm_settings .bar em{background:#2FBF71;height:4px}#pm_settings .bar{background:#0d0d0d;opacity:.5;height:4px}#plans .plans .plan h3{background:#0d0d0d;color:#fff}#plans .plans .plan.plus-plan h3 span,#plans .plans .plan.visionary-plan h3 span,#plans .plans .plan.visionary-plan header{color:#fff}#plans .plans .plan footer .cycle strong{color:#2FBF71}#plans .plans .plan footer .cycle .discount{border-color:transparent #2FBF71 transparent transparent}#plans .plans .plan footer .cycle .discount span{color:#fff}.pm_modal .modal-dialog{border-color:#0d0d0d}.pm_modal .modal-dialog .close{color:#fff;background:#0d0d0d}.pm_badge{color:#fff}.pm_badge.primary{background:#0d0d0d;color:#fff}.pm_badge.success{background:#2FBF71;color:#fff}.pm_table table th .fa,.pm_table table th a{color:#2FBF71}body .cg-notify-message.notification-success{background-color:#2FBF71;color:#fff}
diff --git a/Themes/v3.7.3/blue_and_orange/blue_and_orange.css b/Themes/v3.7.3/blue_and_orange/blue_and_orange.css
deleted file mode 100644
index 2836779..0000000
--- a/Themes/v3.7.3/blue_and_orange/blue_and_orange.css
+++ /dev/null
@@ -1,302 +0,0 @@
-/* =========================================== *
- * BLUE AND ORANGE 3.7.3 THEME
- * Author: Cristiano Almeida
- * Website: www.csalmeida.com
- * Tweets @_csalmeida
- * =========================================== */
-.headerDesktop-container {
-  background-color: #0F4C5C;
-}
-
-.search-form-fieldset {
-  background: #0A353F;
-}
-
-[class*="searchForm-action-button-"] {
-  color: #fff;
-}
-
-.searchForm-action-button-advanced:hover, .searchForm-action-button-toggle:hover {
-  background: #ED7D3A;
-}
-
-.customRadio-input:checked + .customRadio-mask {
-  box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 10px #ED7D3A;
-  border-color: #ED7D3A;
-}
-
-.pm_button.primary, .pm_button.primary:active {
-  color: #fff;
-  background-color: #0F4C5C;
-  border-color: #0F4C5C;
-}
-
-.pm_button.primary:hover, .pm_button.primary:focus {
-  background-color: #0A353F;
-  border-color: #0A353F;
-}
-
-.navigation > li.active, .navigation > li:hover {
-  box-shadow: 0 5px 0 0 #ED7D3A inset;
-}
-
-.navigation-link {
-  color: #fff;
-}
-
-.navigation-title:hover {
-  color: #ED7D3A;
-}
-
-.pm_dropdown .navigationUser-logout {
-  background-color: #0F4C5C !important;
-  border-color: #0F4C5C !important;
-  color: #fff !important;
-}
-
-.pm_dropdown .navigationUser-logout:hover {
-  background-color: #0A353F !important;
-  border-color: #0A353F !important;
-  color: #fff !important;
-}
-
-.sidebar-btn-compose, .sidebar-btn-compose:active {
-  color: #fff !important;
-  background: #ED7D3A !important;
-  border: none !important;
-}
-
-.sidebar-btn-compose:hover {
-  color: #fff !important;
-  background: #ED7D3A !important;
-  border: none !important;
-  box-shadow: inset 0 400px 400px rgba(0, 0, 0, 0.1);
-}
-
-.headerDesktop-logo {
-  background-color: #0F4C5C;
-}
-
-body section.sidebar {
-  background: #0F4C5C;
-}
-
-body section.sidebar a.compose {
-  background: #ED7D3A;
-  color: #fff;
-}
-
-body section.sidebar a.compose:hover {
-  background: #fff;
-  border-color: #fff;
-  color: #0F4C5C;
-}
-
-body section.sidebar ul.menu li a {
-  color: #fff;
-}
-
-body section.sidebar ul.menu li a:hover {
-  color: #ED7D3A;
-}
-
-body section.sidebar ul.menu li.active a, body section.sidebar ul.menu li.active a {
-  color: #fff;
-}
-
-body section.sidebar ul.menu li.active a i.fa, body section.sidebar ul.menu li.active a i.fa:hover {
-  color: #ED7D3A !important;
-  opacity: 1;
-}
-
-body section.sidebar ul.menu li a .fa-repeat {
-  color: #fff;
-  opacity: 1;
-}
-
-body section.sidebar ul.menu li a i.fa {
-  color: #fff;
-  opacity: 0.5;
-}
-
-body section.sidebar ul.menu li a i.fa:hover, body section.sidebar ul.menu li a:hover i.fa {
-  color: #fff;
-  opacity: 1;
-}
-
-body section.sidebar ul.menu li a em {
-  color: #fff;
-  opacity: 0.5;
-}
-
-body section.sidebar div.labels ul li a {
-  color: #fff;
-  opacity: 0.5;
-}
-
-body section.sidebar div.labels ul li a:hover {
-  color: #fff;
-  opacity: 1;
-}
-
-body section.sidebar div.footer div.link a, body section.sidebar a.version {
-  color: #fff;
-  opacity: 0.5;
-}
-
-body section.sidebar div.footer div.link a:hover, body section.sidebar a.version:hover {
-  color: #ED7D3A;
-  opacity: 1;
-}
-
-body section.sidebar div.footer div.storage strong {
-  color: #fff;
-  opacity: 0.5;
-}
-
-body section.sidebar div.footer .bar em {
-  background: #ED7D3A;
-  height: 3px;
-}
-
-body section.sidebar div.footer .bar {
-  background: #fff;
-  height: 3px;
-}
-
-.pm_buttons, .pm_buttons a {
-  color: #0F4C5C;
-}
-
-.conversation.marked::before {
-  background: #ED7D3A;
-  width: 5px;
-}
-
-#pm_composer .composer header {
-  background: #0F4C5C;
-  color: #fff;
-}
-
-p a {
-  color: #ED7D3A;
-}
-
-#pm_composer .composer footer .pm_button {
-  background: #fff;
-  color: #0F4C5C;
-}
-
-#pm_composer .composer footer .pm_button:hover {
-  background: #fff;
-  color: #0F4C5C;
-}
-
-#pm_composer .composer footer .pm_button.primary {
-  background: #0F4C5C;
-  color: #fff;
-}
-
-#pm_composer .composer footer .pm_button.primary:hover {
-  background: #ED7D3A;
-  color: #fff;
-}
-
-#pm_settings .pm_tabs {
-  background: #e6eaf0;
-}
-
-#pm_settings .pm_tabs li a.pm_button {
-  color: #0F4C5C;
-  border-color: #e6eaf0;
-}
-
-#pm_settings .pm_tabs li a.pm_button:hover {
-  color: #ED7D3A;
-}
-
-#pm_settings .pm_tabs li.active a.pm_button {
-  color: #ED7D3A;
-}
-
-.pm_button.link {
-  color: #ED7D3A;
-}
-
-.pm_toggle.off .off, .pm_toggle.on .on {
-  background: #0F4C5C;
-  color: #fff;
-}
-
-.alert.alert-info {
-  background: #e6eaf0;
-  color: #000;
-}
-
-html.protonmail .text-purple {
-  color: #ED7D3A;
-}
-
-#pm_settings .bar em {
-  background: #ED7D3A;
-  height: 4px;
-}
-
-#pm_settings .bar {
-  background: #0F4C5C;
-  opacity: 0.5;
-  height: 4px;
-}
-
-#plans .plans .plan h3 {
-  background: #0F4C5C;
-  color: #fff;
-}
-
-#plans .plans .plan.plus-plan h3 span, #plans .plans .plan.visionary-plan h3 span, #plans .plans .plan.visionary-plan header {
-  color: #fff;
-}
-
-#plans .plans .plan footer .cycle strong {
-  color: #ED7D3A;
-}
-
-#plans .plans .plan footer .cycle .discount {
-  border-color: transparent #ED7D3A transparent transparent;
-}
-
-#plans .plans .plan footer .cycle .discount span {
-  color: #fff;
-}
-
-.pm_modal .modal-dialog {
-  border-color: #0F4C5C;
-}
-
-.pm_modal .modal-dialog .close {
-  color: #fff;
-  background: #0F4C5C;
-}
-
-.pm_badge {
-  color: #fff;
-}
-
-.pm_badge.primary {
-  background: #0F4C5C;
-  color: #fff;
-}
-
-.pm_badge.success {
-  background: #ED7D3A;
-  color: #fff;
-}
-
-.pm_table table th a, .pm_table table th .fa {
-  color: #ED7D3A;
-}
-
-body .cg-notify-message.notification-success {
-  background-color: #ED7D3A;
-  color: #fff;
-}
diff --git a/Themes/v3.7.3/blue_and_orange/blue_and_orange.min.css b/Themes/v3.7.3/blue_and_orange/blue_and_orange.min.css
deleted file mode 100644
index 7aa706d..0000000
--- a/Themes/v3.7.3/blue_and_orange/blue_and_orange.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.headerDesktop-container{background-color:#0F4C5C}.search-form-fieldset{background:#0A353F}[class*="searchForm-action-button-"]{color:#fff}.searchForm-action-button-advanced:hover,.searchForm-action-button-toggle:hover{background:#ED7D3A}.customRadio-input:checked+.customRadio-mask{box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 10px #ED7D3A;border-color:#ED7D3A}.pm_button.primary,.pm_button.primary:active{color:#fff;background-color:#0F4C5C;border-color:#0F4C5C}.pm_button.primary:hover,.pm_button.primary:focus{background-color:#0A353F;border-color:#0A353F}.navigation>li.active,.navigation>li:hover{box-shadow:0 5px 0 0 #ED7D3A inset}.navigation-link{color:#fff}.navigation-title:hover{color:#ED7D3A}.pm_dropdown .navigationUser-logout{background-color:#0F4C5C !important;border-color:#0F4C5C !important;color:#fff !important}.pm_dropdown .navigationUser-logout:hover{background-color:#0A353F !important;border-color:#0A353F !important;color:#fff !important}.sidebar-btn-compose,.sidebar-btn-compose:active{color:#fff !important;background:#ED7D3A !important;border:none !important}.sidebar-btn-compose:hover{color:#fff !important;background:#ED7D3A !important;border:none !important;box-shadow:inset 0 400px 400px rgba(0,0,0,0.1)}.headerDesktop-logo{background-color:#0F4C5C}body section.sidebar{background:#0F4C5C}body section.sidebar a.compose{background:#ED7D3A;color:#fff}body section.sidebar a.compose:hover{background:#fff;border-color:#fff;color:#0F4C5C}body section.sidebar ul.menu li a{color:#fff}body section.sidebar ul.menu li a:hover{color:#ED7D3A}body section.sidebar ul.menu li.active a,body section.sidebar ul.menu li.active a{color:#fff}body section.sidebar ul.menu li.active a i.fa,body section.sidebar ul.menu li.active a i.fa:hover{color:#ED7D3A !important;opacity:1}body section.sidebar ul.menu li a .fa-repeat{color:#fff;opacity:1}body section.sidebar ul.menu li a i.fa{color:#fff;opacity:0.5}body section.sidebar ul.menu li a i.fa:hover,body section.sidebar ul.menu li a:hover i.fa{color:#fff;opacity:1}body section.sidebar ul.menu li a em{color:#fff;opacity:0.5}body section.sidebar div.labels ul li a{color:#fff;opacity:0.5}body section.sidebar div.labels ul li a:hover{color:#fff;opacity:1}body section.sidebar div.footer div.link a,body section.sidebar a.version{color:#fff;opacity:0.5}body section.sidebar div.footer div.link a:hover,body section.sidebar a.version:hover{color:#ED7D3A;opacity:1}body section.sidebar div.footer div.storage strong{color:#fff;opacity:0.5}body section.sidebar div.footer .bar em{background:#ED7D3A;height:3px}body section.sidebar div.footer .bar{background:#fff;height:3px}.pm_buttons,.pm_buttons a{color:#0F4C5C}.conversation.marked::before{background:#ED7D3A;width:5px}#pm_composer .composer header{background:#0F4C5C;color:#fff}p a{color:#ED7D3A}#pm_composer .composer footer .pm_button{background:#fff;color:#0F4C5C}#pm_composer .composer footer .pm_button:hover{background:#fff;color:#0F4C5C}#pm_composer .composer footer .pm_button.primary{background:#0F4C5C;color:#fff}#pm_composer .composer footer .pm_button.primary:hover{background:#ED7D3A;color:#fff}#pm_settings .pm_tabs{background:#e6eaf0}#pm_settings .pm_tabs li a.pm_button{color:#0F4C5C;border-color:#e6eaf0}#pm_settings .pm_tabs li a.pm_button:hover{color:#ED7D3A}#pm_settings .pm_tabs li.active a.pm_button{color:#ED7D3A}.pm_button.link{color:#ED7D3A}.pm_toggle.off .off,.pm_toggle.on .on{background:#0F4C5C;color:#fff}.alert.alert-info{background:#e6eaf0;color:#000}html.protonmail .text-purple{color:#ED7D3A}#pm_settings .bar em{background:#ED7D3A;height:4px}#pm_settings .bar{background:#0F4C5C;opacity:0.5;height:4px}#plans .plans .plan h3{background:#0F4C5C;color:#fff}#plans .plans .plan.plus-plan h3 span,#plans .plans .plan.visionary-plan h3 span,#plans .plans .plan.visionary-plan header{color:#fff}#plans .plans .plan footer .cycle strong{color:#ED7D3A}#plans .plans .plan footer .cycle .discount{border-color:transparent #ED7D3A transparent transparent}#plans .plans .plan footer .cycle .discount span{color:#fff}.pm_modal .modal-dialog{border-color:#0F4C5C}.pm_modal .modal-dialog .close{color:#fff;background:#0F4C5C}.pm_badge{color:#fff}.pm_badge.primary{background:#0F4C5C;color:#fff}.pm_badge.success{background:#ED7D3A;color:#fff}.pm_table table th a,.pm_table table th .fa{color:#ED7D3A}body .cg-notify-message.notification-success{background-color:#ED7D3A;color:#fff}
diff --git a/Themes/v3.7.3/dark_bubble_gum/dark_bubble_gum.css b/Themes/v3.7.3/dark_bubble_gum/dark_bubble_gum.css
deleted file mode 100644
index d7d2da5..0000000
--- a/Themes/v3.7.3/dark_bubble_gum/dark_bubble_gum.css
+++ /dev/null
@@ -1,302 +0,0 @@
-/* =========================================== *
- * DARK BUBBLE GUM 3.7.3 THEME
- * Author: Cristiano Almeida
- * Website: www.csalmeida.com
- * Tweets @_csalmeida
- * =========================================== */
-.headerDesktop-container {
-  background-color: #0d0d0d;
-}
-
-.search-form-fieldset {
-  background: #000;
-}
-
-[class*="searchForm-action-button-"] {
-  color: #fff;
-}
-
-.searchForm-action-button-advanced:hover, .searchForm-action-button-toggle:hover {
-  background: #EF2D56;
-}
-
-.customRadio-input:checked + .customRadio-mask {
-  box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 10px #EF2D56;
-  border-color: #EF2D56;
-}
-
-.pm_button.primary, .pm_button.primary:active {
-  color: #fff;
-  background-color: #0d0d0d;
-  border-color: #0d0d0d;
-}
-
-.pm_button.primary:hover, .pm_button.primary:focus {
-  background-color: #000;
-  border-color: #000;
-}
-
-.navigation > li.active, .navigation > li:hover {
-  box-shadow: 0 5px 0 0 #EF2D56 inset;
-}
-
-.navigation-link {
-  color: #fff;
-}
-
-.navigation-title:hover {
-  color: #EF2D56;
-}
-
-.pm_dropdown .navigationUser-logout {
-  background-color: #0d0d0d !important;
-  border-color: #0d0d0d !important;
-  color: #fff !important;
-}
-
-.pm_dropdown .navigationUser-logout:hover {
-  background-color: #000 !important;
-  border-color: #000 !important;
-  color: #fff !important;
-}
-
-.sidebar-btn-compose, .sidebar-btn-compose:active {
-  color: #fff !important;
-  background: #EF2D56 !important;
-  border: none !important;
-}
-
-.sidebar-btn-compose:hover {
-  color: #fff !important;
-  background: #EF2D56 !important;
-  border: none !important;
-  box-shadow: inset 0 400px 400px rgba(0, 0, 0, 0.1);
-}
-
-.headerDesktop-logo {
-  background-color: #0d0d0d;
-}
-
-body section.sidebar {
-  background: #0d0d0d;
-}
-
-body section.sidebar a.compose {
-  background: #EF2D56;
-  color: #fff;
-}
-
-body section.sidebar a.compose:hover {
-  background: #fff;
-  border-color: #fff;
-  color: #0d0d0d;
-}
-
-body section.sidebar ul.menu li a {
-  color: #fff;
-}
-
-body section.sidebar ul.menu li a:hover {
-  color: #EF2D56;
-}
-
-body section.sidebar ul.menu li.active a, body section.sidebar ul.menu li.active a {
-  color: #fff;
-}
-
-body section.sidebar ul.menu li.active a i.fa, body section.sidebar ul.menu li.active a i.fa:hover {
-  color: #EF2D56 !important;
-  opacity: 1;
-}
-
-body section.sidebar ul.menu li a .fa-repeat {
-  color: #fff;
-  opacity: 1;
-}
-
-body section.sidebar ul.menu li a i.fa {
-  color: #fff;
-  opacity: 0.5;
-}
-
-body section.sidebar ul.menu li a i.fa:hover, body section.sidebar ul.menu li a:hover i.fa {
-  color: #fff;
-  opacity: 1;
-}
-
-body section.sidebar ul.menu li a em {
-  color: #fff;
-  opacity: 0.5;
-}
-
-body section.sidebar div.labels ul li a {
-  color: #fff;
-  opacity: 0.5;
-}
-
-body section.sidebar div.labels ul li a:hover {
-  color: #fff;
-  opacity: 1;
-}
-
-body section.sidebar div.footer div.link a, body section.sidebar a.version {
-  color: #fff;
-  opacity: 0.5;
-}
-
-body section.sidebar div.footer div.link a:hover, body section.sidebar a.version:hover {
-  color: #EF2D56;
-  opacity: 1;
-}
-
-body section.sidebar div.footer div.storage strong {
-  color: #fff;
-  opacity: 0.5;
-}
-
-body section.sidebar div.footer .bar em {
-  background: #EF2D56;
-  height: 3px;
-}
-
-body section.sidebar div.footer .bar {
-  background: #fff;
-  height: 3px;
-}
-
-.pm_buttons, .pm_buttons a {
-  color: #0d0d0d;
-}
-
-.conversation.marked::before {
-  background: #EF2D56;
-  width: 5px;
-}
-
-#pm_composer .composer header {
-  background: #0d0d0d;
-  color: #fff;
-}
-
-p a {
-  color: #EF2D56;
-}
-
-#pm_composer .composer footer .pm_button {
-  background: #fff;
-  color: #0d0d0d;
-}
-
-#pm_composer .composer footer .pm_button:hover {
-  background: #fff;
-  color: #0d0d0d;
-}
-
-#pm_composer .composer footer .pm_button.primary {
-  background: #0d0d0d;
-  color: #fff;
-}
-
-#pm_composer .composer footer .pm_button.primary:hover {
-  background: #EF2D56;
-  color: #fff;
-}
-
-#pm_settings .pm_tabs {
-  background: #e6eaf0;
-}
-
-#pm_settings .pm_tabs li a.pm_button {
-  color: #0d0d0d;
-  border-color: #e6eaf0;
-}
-
-#pm_settings .pm_tabs li a.pm_button:hover {
-  color: #EF2D56;
-}
-
-#pm_settings .pm_tabs li.active a.pm_button {
-  color: #EF2D56;
-}
-
-.pm_button.link {
-  color: #EF2D56;
-}
-
-.pm_toggle.off .off, .pm_toggle.on .on {
-  background: #0d0d0d;
-  color: #fff;
-}
-
-.alert.alert-info {
-  background: #e6eaf0;
-  color: #000;
-}
-
-html.protonmail .text-purple {
-  color: #EF2D56;
-}
-
-#pm_settings .bar em {
-  background: #EF2D56;
-  height: 4px;
-}
-
-#pm_settings .bar {
-  background: #0d0d0d;
-  opacity: 0.5;
-  height: 4px;
-}
-
-#plans .plans .plan h3 {
-  background: #0d0d0d;
-  color: #fff;
-}
-
-#plans .plans .plan.plus-plan h3 span, #plans .plans .plan.visionary-plan h3 span, #plans .plans .plan.visionary-plan header {
-  color: #fff;
-}
-
-#plans .plans .plan footer .cycle strong {
-  color: #EF2D56;
-}
-
-#plans .plans .plan footer .cycle .discount {
-  border-color: transparent #EF2D56 transparent transparent;
-}
-
-#plans .plans .plan footer .cycle .discount span {
-  color: #fff;
-}
-
-.pm_modal .modal-dialog {
-  border-color: #0d0d0d;
-}
-
-.pm_modal .modal-dialog .close {
-  color: #fff;
-  background: #0d0d0d;
-}
-
-.pm_badge {
-  color: #fff;
-}
-
-.pm_badge.primary {
-  background: #0d0d0d;
-  color: #fff;
-}
-
-.pm_badge.success {
-  background: #EF2D56;
-  color: #fff;
-}
-
-.pm_table table th a, .pm_table table th .fa {
-  color: #EF2D56;
-}
-
-body .cg-notify-message.notification-success {
-  background-color: #EF2D56;
-  color: #fff;
-}
diff --git a/Themes/v3.7.3/dark_bubble_gum/dark_bubble_gum.min.css b/Themes/v3.7.3/dark_bubble_gum/dark_bubble_gum.min.css
deleted file mode 100644
index 9d8e7d3..0000000
--- a/Themes/v3.7.3/dark_bubble_gum/dark_bubble_gum.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.headerDesktop-container{background-color:#0d0d0d}.search-form-fieldset{background:#000}[class*="searchForm-action-button-"]{color:#fff}.searchForm-action-button-advanced:hover,.searchForm-action-button-toggle:hover{background:#EF2D56}.customRadio-input:checked+.customRadio-mask{box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 10px #EF2D56;border-color:#EF2D56}.pm_button.primary,.pm_button.primary:active{color:#fff;background-color:#0d0d0d;border-color:#0d0d0d}.pm_button.primary:hover,.pm_button.primary:focus{background-color:#000;border-color:#000}.navigation>li.active,.navigation>li:hover{box-shadow:0 5px 0 0 #EF2D56 inset}.navigation-link{color:#fff}.navigation-title:hover{color:#EF2D56}.pm_dropdown .navigationUser-logout{background-color:#0d0d0d !important;border-color:#0d0d0d !important;color:#fff !important}.pm_dropdown .navigationUser-logout:hover{background-color:#000 !important;border-color:#000 !important;color:#fff !important}.sidebar-btn-compose,.sidebar-btn-compose:active{color:#fff !important;background:#EF2D56 !important;border:none !important}.sidebar-btn-compose:hover{color:#fff !important;background:#EF2D56 !important;border:none !important;box-shadow:inset 0 400px 400px rgba(0,0,0,0.1)}.headerDesktop-logo{background-color:#0d0d0d}body section.sidebar{background:#0d0d0d}body section.sidebar a.compose{background:#EF2D56;color:#fff}body section.sidebar a.compose:hover{background:#fff;border-color:#fff;color:#0d0d0d}body section.sidebar ul.menu li a{color:#fff}body section.sidebar ul.menu li a:hover{color:#EF2D56}body section.sidebar ul.menu li.active a,body section.sidebar ul.menu li.active a{color:#fff}body section.sidebar ul.menu li.active a i.fa,body section.sidebar ul.menu li.active a i.fa:hover{color:#EF2D56 !important;opacity:1}body section.sidebar ul.menu li a .fa-repeat{color:#fff;opacity:1}body section.sidebar ul.menu li a i.fa{color:#fff;opacity:0.5}body section.sidebar ul.menu li a i.fa:hover,body section.sidebar ul.menu li a:hover i.fa{color:#fff;opacity:1}body section.sidebar ul.menu li a em{color:#fff;opacity:0.5}body section.sidebar div.labels ul li a{color:#fff;opacity:0.5}body section.sidebar div.labels ul li a:hover{color:#fff;opacity:1}body section.sidebar div.footer div.link a,body section.sidebar a.version{color:#fff;opacity:0.5}body section.sidebar div.footer div.link a:hover,body section.sidebar a.version:hover{color:#EF2D56;opacity:1}body section.sidebar div.footer div.storage strong{color:#fff;opacity:0.5}body section.sidebar div.footer .bar em{background:#EF2D56;height:3px}body section.sidebar div.footer .bar{background:#fff;height:3px}.pm_buttons,.pm_buttons a{color:#0d0d0d}.conversation.marked::before{background:#EF2D56;width:5px}#pm_composer .composer header{background:#0d0d0d;color:#fff}p a{color:#EF2D56}#pm_composer .composer footer .pm_button{background:#fff;color:#0d0d0d}#pm_composer .composer footer .pm_button:hover{background:#fff;color:#0d0d0d}#pm_composer .composer footer .pm_button.primary{background:#0d0d0d;color:#fff}#pm_composer .composer footer .pm_button.primary:hover{background:#EF2D56;color:#fff}#pm_settings .pm_tabs{background:#e6eaf0}#pm_settings .pm_tabs li a.pm_button{color:#0d0d0d;border-color:#e6eaf0}#pm_settings .pm_tabs li a.pm_button:hover{color:#EF2D56}#pm_settings .pm_tabs li.active a.pm_button{color:#EF2D56}.pm_button.link{color:#EF2D56}.pm_toggle.off .off,.pm_toggle.on .on{background:#0d0d0d;color:#fff}.alert.alert-info{background:#e6eaf0;color:#000}html.protonmail .text-purple{color:#EF2D56}#pm_settings .bar em{background:#EF2D56;height:4px}#pm_settings .bar{background:#0d0d0d;opacity:0.5;height:4px}#plans .plans .plan h3{background:#0d0d0d;color:#fff}#plans .plans .plan.plus-plan h3 span,#plans .plans .plan.visionary-plan h3 span,#plans .plans .plan.visionary-plan header{color:#fff}#plans .plans .plan footer .cycle strong{color:#EF2D56}#plans .plans .plan footer .cycle .discount{border-color:transparent #EF2D56 transparent transparent}#plans .plans .plan footer .cycle .discount span{color:#fff}.pm_modal .modal-dialog{border-color:#0d0d0d}.pm_modal .modal-dialog .close{color:#fff;background:#0d0d0d}.pm_badge{color:#fff}.pm_badge.primary{background:#0d0d0d;color:#fff}.pm_badge.success{background:#EF2D56;color:#fff}.pm_table table th a,.pm_table table th .fa{color:#EF2D56}body .cg-notify-message.notification-success{background-color:#EF2D56;color:#fff}
diff --git a/Themes/v3.7.3/green_lume/green_lume.css b/Themes/v3.7.3/green_lume/green_lume.css
deleted file mode 100644
index a917af6..0000000
--- a/Themes/v3.7.3/green_lume/green_lume.css
+++ /dev/null
@@ -1,302 +0,0 @@
-/* =========================================== *
- * GREEN LUME 3.7.3 THEME
- * Author: Cristiano Almeida
- * Website: www.csalmeida.com
- * Tweets @_csalmeida
- * =========================================== */
-.headerDesktop-container {
-  background-color: #0d0d0d;
-}
-
-.search-form-fieldset {
-  background: #000;
-}
-
-[class*="searchForm-action-button-"] {
-  color: #fff;
-}
-
-.searchForm-action-button-advanced:hover, .searchForm-action-button-toggle:hover {
-  background: #2FBF71;
-}
-
-.customRadio-input:checked + .customRadio-mask {
-  box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 10px #2FBF71;
-  border-color: #2FBF71;
-}
-
-.pm_button.primary, .pm_button.primary:active {
-  color: #fff;
-  background-color: #0d0d0d;
-  border-color: #0d0d0d;
-}
-
-.pm_button.primary:hover, .pm_button.primary:focus {
-  background-color: #000;
-  border-color: #000;
-}
-
-.navigation > li.active, .navigation > li:hover {
-  box-shadow: 0 5px 0 0 #2FBF71 inset;
-}
-
-.navigation-link {
-  color: #fff;
-}
-
-.navigation-title:hover {
-  color: #2FBF71;
-}
-
-.pm_dropdown .navigationUser-logout {
-  background-color: #0d0d0d !important;
-  border-color: #0d0d0d !important;
-  color: #fff !important;
-}
-
-.pm_dropdown .navigationUser-logout:hover {
-  background-color: #000 !important;
-  border-color: #000 !important;
-  color: #fff !important;
-}
-
-.sidebar-btn-compose, .sidebar-btn-compose:active {
-  color: #fff !important;
-  background: #2FBF71 !important;
-  border: none !important;
-}
-
-.sidebar-btn-compose:hover {
-  color: #fff !important;
-  background: #2FBF71 !important;
-  border: none !important;
-  box-shadow: inset 0 400px 400px rgba(0, 0, 0, 0.1);
-}
-
-.headerDesktop-logo {
-  background-color: #0d0d0d;
-}
-
-body section.sidebar {
-  background: #0d0d0d;
-}
-
-body section.sidebar a.compose {
-  background: #2FBF71;
-  color: #fff;
-}
-
-body section.sidebar a.compose:hover {
-  background: #fff;
-  border-color: #fff;
-  color: #0d0d0d;
-}
-
-body section.sidebar ul.menu li a {
-  color: #fff;
-}
-
-body section.sidebar ul.menu li a:hover {
-  color: #2FBF71;
-}
-
-body section.sidebar ul.menu li.active a, body section.sidebar ul.menu li.active a {
-  color: #fff;
-}
-
-body section.sidebar ul.menu li.active a i.fa, body section.sidebar ul.menu li.active a i.fa:hover {
-  color: #2FBF71 !important;
-  opacity: 1;
-}
-
-body section.sidebar ul.menu li a .fa-repeat {
-  color: #fff;
-  opacity: 1;
-}
-
-body section.sidebar ul.menu li a i.fa {
-  color: #fff;
-  opacity: 0.5;
-}
-
-body section.sidebar ul.menu li a i.fa:hover, body section.sidebar ul.menu li a:hover i.fa {
-  color: #fff;
-  opacity: 1;
-}
-
-body section.sidebar ul.menu li a em {
-  color: #fff;
-  opacity: 0.5;
-}
-
-body section.sidebar div.labels ul li a {
-  color: #fff;
-  opacity: 0.5;
-}
-
-body section.sidebar div.labels ul li a:hover {
-  color: #fff;
-  opacity: 1;
-}
-
-body section.sidebar div.footer div.link a, body section.sidebar a.version {
-  color: #fff;
-  opacity: 0.5;
-}
-
-body section.sidebar div.footer div.link a:hover, body section.sidebar a.version:hover {
-  color: #2FBF71;
-  opacity: 1;
-}
-
-body section.sidebar div.footer div.storage strong {
-  color: #fff;
-  opacity: 0.5;
-}
-
-body section.sidebar div.footer .bar em {
-  background: #2FBF71;
-  height: 3px;
-}
-
-body section.sidebar div.footer .bar {
-  background: #fff;
-  height: 3px;
-}
-
-.pm_buttons, .pm_buttons a {
-  color: #0d0d0d;
-}
-
-.conversation.marked::before {
-  background: #2FBF71;
-  width: 5px;
-}
-
-#pm_composer .composer header {
-  background: #0d0d0d;
-  color: #fff;
-}
-
-p a {
-  color: #2FBF71;
-}
-
-#pm_composer .composer footer .pm_button {
-  background: #fff;
-  color: #0d0d0d;
-}
-
-#pm_composer .composer footer .pm_button:hover {
-  background: #fff;
-  color: #0d0d0d;
-}
-
-#pm_composer .composer footer .pm_button.primary {
-  background: #0d0d0d;
-  color: #fff;
-}
-
-#pm_composer .composer footer .pm_button.primary:hover {
-  background: #2FBF71;
-  color: #fff;
-}
-
-#pm_settings .pm_tabs {
-  background: #e6eaf0;
-}
-
-#pm_settings .pm_tabs li a.pm_button {
-  color: #0d0d0d;
-  border-color: #e6eaf0;
-}
-
-#pm_settings .pm_tabs li a.pm_button:hover {
-  color: #2FBF71;
-}
-
-#pm_settings .pm_tabs li.active a.pm_button {
-  color: #2FBF71;
-}
-
-.pm_button.link {
-  color: #2FBF71;
-}
-
-.pm_toggle.off .off, .pm_toggle.on .on {
-  background: #0d0d0d;
-  color: #fff;
-}
-
-.alert.alert-info {
-  background: #e6eaf0;
-  color: #000;
-}
-
-html.protonmail .text-purple {
-  color: #2FBF71;
-}
-
-#pm_settings .bar em {
-  background: #2FBF71;
-  height: 4px;
-}
-
-#pm_settings .bar {
-  background: #0d0d0d;
-  opacity: 0.5;
-  height: 4px;
-}
-
-#plans .plans .plan h3 {
-  background: #0d0d0d;
-  color: #fff;
-}
-
-#plans .plans .plan.plus-plan h3 span, #plans .plans .plan.visionary-plan h3 span, #plans .plans .plan.visionary-plan header {
-  color: #fff;
-}
-
-#plans .plans .plan footer .cycle strong {
-  color: #2FBF71;
-}
-
-#plans .plans .plan footer .cycle .discount {
-  border-color: transparent #2FBF71 transparent transparent;
-}
-
-#plans .plans .plan footer .cycle .discount span {
-  color: #fff;
-}
-
-.pm_modal .modal-dialog {
-  border-color: #0d0d0d;
-}
-
-.pm_modal .modal-dialog .close {
-  color: #fff;
-  background: #0d0d0d;
-}
-
-.pm_badge {
-  color: #fff;
-}
-
-.pm_badge.primary {
-  background: #0d0d0d;
-  color: #fff;
-}
-
-.pm_badge.success {
-  background: #2FBF71;
-  color: #fff;
-}
-
-.pm_table table th a, .pm_table table th .fa {
-  color: #2FBF71;
-}
-
-body .cg-notify-message.notification-success {
-  background-color: #2FBF71;
-  color: #fff;
-}
diff --git a/Themes/v3.7.3/green_lume/green_lume.min.css b/Themes/v3.7.3/green_lume/green_lume.min.css
deleted file mode 100644
index a6de5f2..0000000
--- a/Themes/v3.7.3/green_lume/green_lume.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.headerDesktop-container{background-color:#0d0d0d}.search-form-fieldset{background:#000}[class*="searchForm-action-button-"]{color:#fff}.searchForm-action-button-advanced:hover,.searchForm-action-button-toggle:hover{background:#2FBF71}.customRadio-input:checked+.customRadio-mask{box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 10px #2FBF71;border-color:#2FBF71}.pm_button.primary,.pm_button.primary:active{color:#fff;background-color:#0d0d0d;border-color:#0d0d0d}.pm_button.primary:hover,.pm_button.primary:focus{background-color:#000;border-color:#000}.navigation>li.active,.navigation>li:hover{box-shadow:0 5px 0 0 #2FBF71 inset}.navigation-link{color:#fff}.navigation-title:hover{color:#2FBF71}.pm_dropdown .navigationUser-logout{background-color:#0d0d0d !important;border-color:#0d0d0d !important;color:#fff !important}.pm_dropdown .navigationUser-logout:hover{background-color:#000 !important;border-color:#000 !important;color:#fff !important}.sidebar-btn-compose,.sidebar-btn-compose:active{color:#fff !important;background:#2FBF71 !important;border:none !important}.sidebar-btn-compose:hover{color:#fff !important;background:#2FBF71 !important;border:none !important;box-shadow:inset 0 400px 400px rgba(0,0,0,0.1)}.headerDesktop-logo{background-color:#0d0d0d}body section.sidebar{background:#0d0d0d}body section.sidebar a.compose{background:#2FBF71;color:#fff}body section.sidebar a.compose:hover{background:#fff;border-color:#fff;color:#0d0d0d}body section.sidebar ul.menu li a{color:#fff}body section.sidebar ul.menu li a:hover{color:#2FBF71}body section.sidebar ul.menu li.active a,body section.sidebar ul.menu li.active a{color:#fff}body section.sidebar ul.menu li.active a i.fa,body section.sidebar ul.menu li.active a i.fa:hover{color:#2FBF71 !important;opacity:1}body section.sidebar ul.menu li a .fa-repeat{color:#fff;opacity:1}body section.sidebar ul.menu li a i.fa{color:#fff;opacity:0.5}body section.sidebar ul.menu li a i.fa:hover,body section.sidebar ul.menu li a:hover i.fa{color:#fff;opacity:1}body section.sidebar ul.menu li a em{color:#fff;opacity:0.5}body section.sidebar div.labels ul li a{color:#fff;opacity:0.5}body section.sidebar div.labels ul li a:hover{color:#fff;opacity:1}body section.sidebar div.footer div.link a,body section.sidebar a.version{color:#fff;opacity:0.5}body section.sidebar div.footer div.link a:hover,body section.sidebar a.version:hover{color:#2FBF71;opacity:1}body section.sidebar div.footer div.storage strong{color:#fff;opacity:0.5}body section.sidebar div.footer .bar em{background:#2FBF71;height:3px}body section.sidebar div.footer .bar{background:#fff;height:3px}.pm_buttons,.pm_buttons a{color:#0d0d0d}.conversation.marked::before{background:#2FBF71;width:5px}#pm_composer .composer header{background:#0d0d0d;color:#fff}p a{color:#2FBF71}#pm_composer .composer footer .pm_button{background:#fff;color:#0d0d0d}#pm_composer .composer footer .pm_button:hover{background:#fff;color:#0d0d0d}#pm_composer .composer footer .pm_button.primary{background:#0d0d0d;color:#fff}#pm_composer .composer footer .pm_button.primary:hover{background:#2FBF71;color:#fff}#pm_settings .pm_tabs{background:#e6eaf0}#pm_settings .pm_tabs li a.pm_button{color:#0d0d0d;border-color:#e6eaf0}#pm_settings .pm_tabs li a.pm_button:hover{color:#2FBF71}#pm_settings .pm_tabs li.active a.pm_button{color:#2FBF71}.pm_button.link{color:#2FBF71}.pm_toggle.off .off,.pm_toggle.on .on{background:#0d0d0d;color:#fff}.alert.alert-info{background:#e6eaf0;color:#000}html.protonmail .text-purple{color:#2FBF71}#pm_settings .bar em{background:#2FBF71;height:4px}#pm_settings .bar{background:#0d0d0d;opacity:0.5;height:4px}#plans .plans .plan h3{background:#0d0d0d;color:#fff}#plans .plans .plan.plus-plan h3 span,#plans .plans .plan.visionary-plan h3 span,#plans .plans .plan.visionary-plan header{color:#fff}#plans .plans .plan footer .cycle strong{color:#2FBF71}#plans .plans .plan footer .cycle .discount{border-color:transparent #2FBF71 transparent transparent}#plans .plans .plan footer .cycle .discount span{color:#fff}.pm_modal .modal-dialog{border-color:#0d0d0d}.pm_modal .modal-dialog .close{color:#fff;background:#0d0d0d}.pm_badge{color:#fff}.pm_badge.primary{background:#0d0d0d;color:#fff}.pm_badge.success{background:#2FBF71;color:#fff}.pm_table table th a,.pm_table table th .fa{color:#2FBF71}body .cg-notify-message.notification-success{background-color:#2FBF71;color:#fff}
diff --git a/Themes/v3.7.3/monokai/monokai.css b/Themes/v3.7.3/monokai/monokai.css
deleted file mode 100644
index d9722f0..0000000
--- a/Themes/v3.7.3/monokai/monokai.css
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
-built by tripscripts
-
-using Cristiano Almeida's "Theme Generator"
-http://www.csalmeida.com/demos/quark/
-
-this theme is based off of 
-Sublime Text's "Monokai" color scheme
-*/
-
-.headerDesktop-container {
-    background-color: #1D1E1A
-}
-
-.search-form-fieldset {
-    background: #615C4C
-}
-
-[class*="searchForm-action-button-"] {
-    color: #9376D6
-}
-
-.searchForm-action-button-advanced:hover,
-.searchForm-action-button-toggle:hover {
-    background: #89C62A
-}
-
-.customRadio-input:checked+.customRadio-mask {
-    box-shadow: inset 0 0 0 3px #fff, inset 0 0 0 10px #89C62A;
-    border-color: #89C62A
-}
-
-.pm_button.primary,
-.pm_button.primary:active {
-    color: #fff;
-    background-color: #1D1E1A;
-    border-color: #1D1E1A
-}
-
-.pm_button.primary:hover,
-.pm_button.primary:focus {
-    background-color: #615C4C;
-    border-color: #615C4C
-}
-
-.navigation>li.active,
-.navigation>li:hover {
-    box-shadow: 0 5px 0 0 #89C62A inset
-}
-
-.navigation-link {
-    color: #9376D6
-}
-
-.navigation-title:hover {
-    color: #89C62A
-}
-
-.pm_dropdown .navigationUser-logout {
-    background-color: #1D1E1A !important;
-    border-color: #1D1E1A !important;
-    color: #9376D6 !important
-}
-
-.pm_dropdown .navigationUser-logout:hover {
-    background-color: #615C4C !important;
-    border-color: #615C4C !important;
-    color: #9376D6 !important
-}
-
-.sidebar-btn-compose,
-.sidebar-btn-compose:active {
-    color: #fff !important;
-    background: #89C62A !important;
-    border: none !important
-}
-
-.sidebar-btn-compose:hover {
-    color: #fff !important;
-    background: #89C62A !important;
-    border: none !important;
-    box-shadow: inset 0 400px 400px rgba(0, 0, 0, 0.1)
-}
-
-.headerDesktop-logo {
-    background-color: #1D1E1A
-}
-
-body section.sidebar {
-    background: #1D1E1A
-}
-
-body section.sidebar a.compose {
-    background: #89C62A;
-    color: #9376D6
-}
-
-body section.sidebar a.compose:hover {
-    background: #9376D6;
-    border-color: #9376D6;
-    color: #1D1E1A
-}
-
-body section.sidebar ul.menu li a {
-    color: #9376D6
-}
-
-body section.sidebar ul.menu li a:hover {
-    color: #89C62A
-}
-
-body section.sidebar ul.menu li.active a,
-body section.sidebar ul.menu li.active a {
-    color: #9376D6
-}
-
-body section.sidebar ul.menu li.active a i.fa,
-body section.sidebar ul.menu li.active a i.fa:hover {
-    color: #89C62A !important;
-    opacity: 1
-}
-
-body section.sidebar ul.menu li a .fa-repeat {
-    color: #9376D6;
-    opacity: 1
-}
-
-body section.sidebar ul.menu li a i.fa {
-    color: #9376D6;
-    opacity: 0.5
-}
-
-body section.sidebar ul.menu li a i.fa:hover,
-body section.sidebar ul.menu li a:hover i.fa {
-    color: #9376D6;
-    opacity: 1
-}
-
-body section.sidebar ul.menu li a em {
-    color: #9376D6;
-    opacity: 0.5
-}
-
-body section.sidebar div.labels ul li a {
-    color: #9376D6;
-    opacity: 0.5
-}
-
-body section.sidebar div.labels ul li a:hover {
-    color: #9376D6;
-    opacity: 1
-}
-
-body section.sidebar div.footer div.link a,
-body section.sidebar a.version {
-    color: #9376D6;
-    opacity: 0.5
-}
-
-body section.sidebar div.footer div.link a:hover,
-body section.sidebar a.version:hover {
-    color: #89C62A;
-    opacity: 1
-}
-
-body section.sidebar div.footer div.storage strong {
-    color: #9376D6;
-    opacity: 0.5
-}
-
-body section.sidebar div.footer .bar em {
-    background: #89C62A;
-    height: 3px
-}
-
-body section.sidebar div.footer .bar {
-    background: #9376D6;
-    height: 3px
-}
-
-.pm_buttons,
-.pm_buttons a {
-    color: #1D1E1A
-}
-
-.conversation.marked::before {
-    background: #89C62A;
-    width: 5px
-}
-
-#pm_composer .composer header {
-    background: #1D1E1A;
-    color: #9376D6
-}
-
-p a {
-    color: #89C62A
-}
-
-#pm_composer .composer footer .pm_button {
-    background: #9376D6;
-    color: #1D1E1A
-}
-
-#pm_composer .composer footer .pm_button:hover {
-    background: #9376D6;
-    color: #1D1E1A
-}
-
-#pm_composer .composer footer .pm_button.primary {
-    background: #1D1E1A;
-    color: #9376D6
-}
-
-#pm_composer .composer footer .pm_button.primary:hover {
-    background: #89C62A;
-    color: #9376D6
-}
-
-#pm_settings .pm_tabs {
-    background: #e6eaf0
-}
-
-#pm_settings .pm_tabs li a.pm_button {
-    color: #1D1E1A;
-    border-color: #e6eaf0
-}
-
-#pm_settings .pm_tabs li a.pm_button:hover {
-    color: #89C62A
-}
-
-#pm_settings .pm_tabs li.active a.pm_button {
-    color: #89C62A
-}
-
-.pm_button.link {
-    color: #89C62A
-}
-
-.pm_toggle.off .off,
-.pm_toggle.on .on {
-    background: #1D1E1A;
-    color: #9376D6
-}
-
-.alert.alert-info {
-    background: #e6eaf0;
-    color: #000
-}
-
-html.protonmail .text-purple {
-    color: #89C62A
-}
-
-#pm_settings .bar em {
-    background: #89C62A;
-    height: 4px
-}
-
-#pm_settings .bar {
-    background: #1D1E1A;
-    opacity: 0.5;
-    height: 4px
-}
-
-#plans .plans .plan h3 {
-    background: #1D1E1A;
-    color: #9376D6
-}
-
-#plans .plans .plan.plus-plan h3 span,
-#plans .plans .plan.visionary-plan h3 span,
-#plans .plans .plan.visionary-plan header {
-    color: #9376D6
-}
-
-#plans .plans .plan footer .cycle strong {
-    color: #89C62A
-}
-
-#plans .plans .plan footer .cycle .discount {
-    border-color: transparent #89C62A transparent transparent
-}
-
-#plans .plans .plan footer .cycle .discount span {
-    color: #9376D6
-}
-
-.pm_modal .modal-dialog {
-    border-color: #1D1E1A
-}
-
-.pm_modal .modal-dialog .close {
-    color: #9376D6;
-    background: #1D1E1A
-}
-
-.pm_badge {
-    color: #9376D6
-}
-
-.pm_badge.primary {
-    background: #1D1E1A;
-    color: #9376D6
-}
-
-.pm_badge.success {
-    background: #89C62A;
-    color: #9376D6
-}
-
-.pm_table table th a,
-.pm_table table th .fa {
-    color: #89C62A
-}
-
-body .cg-notify-message.notification-success {
-    background-color: #89C62A;
-    color: #9376D6
-}
\ No newline at end of file
diff --git a/Themes/v3.7.3/monokai/monokai.min.css b/Themes/v3.7.3/monokai/monokai.min.css
deleted file mode 100644
index 372eb78..0000000
--- a/Themes/v3.7.3/monokai/monokai.min.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
-built by tripscripts
-
-using Cristiano Almeida's "Theme Generator"
-http://www.csalmeida.com/demos/quark/
-
-this theme is based off of 
-Sublime Text's "Monokai" color scheme
-*/
-.headerDesktop-container{background-color:#1D1E1A}.search-form-fieldset{background:#615C4C}[class*="searchForm-action-button-"]{color:#9376D6}.searchForm-action-button-advanced:hover,.searchForm-action-button-toggle:hover{background:#89C62A}.customRadio-input:checked+.customRadio-mask{box-shadow:inset 0 0 0 3px #fff,inset 0 0 0 10px #89C62A;border-color:#89C62A}.pm_button.primary,.pm_button.primary:active{color:#fff;background-color:#1D1E1A;border-color:#1D1E1A}.pm_button.primary:hover,.pm_button.primary:focus{background-color:#615C4C;border-color:#615C4C}.navigation>li.active,.navigation>li:hover{box-shadow:0 5px 0 0 #89C62A inset}.navigation-link{color:#9376D6}.navigation-title:hover{color:#89C62A}.pm_dropdown .navigationUser-logout{background-color:#1D1E1A !important;border-color:#1D1E1A !important;color:#9376D6 !important}.pm_dropdown .navigationUser-logout:hover{background-color:#615C4C !important;border-color:#615C4C !important;color:#9376D6 !important}.sidebar-btn-compose,.sidebar-btn-compose:active{color:#fff !important;background:#89C62A !important;border:none !important}.sidebar-btn-compose:hover{color:#fff !important;background:#89C62A !important;border:none !important;box-shadow:inset 0 400px 400px rgba(0,0,0,0.1)}.headerDesktop-logo{background-color:#1D1E1A}body section.sidebar{background:#1D1E1A}body section.sidebar a.compose{background:#89C62A;color:#9376D6}body section.sidebar a.compose:hover{background:#9376D6;border-color:#9376D6;color:#1D1E1A}body section.sidebar ul.menu li a{color:#9376D6}body section.sidebar ul.menu li a:hover{color:#89C62A}body section.sidebar ul.menu li.active a,body section.sidebar ul.menu li.active a{color:#9376D6}body section.sidebar ul.menu li.active a i.fa,body section.sidebar ul.menu li.active a i.fa:hover{color:#89C62A !important;opacity:1}body section.sidebar ul.menu li a .fa-repeat{color:#9376D6;opacity:1}body section.sidebar ul.menu li a i.fa{color:#9376D6;opacity:0.5}body section.sidebar ul.menu li a i.fa:hover,body section.sidebar ul.menu li a:hover i.fa{color:#9376D6;opacity:1}body section.sidebar ul.menu li a em{color:#9376D6;opacity:0.5}body section.sidebar div.labels ul li a{color:#9376D6;opacity:0.5}body section.sidebar div.labels ul li a:hover{color:#9376D6;opacity:1}body section.sidebar div.footer div.link a,body section.sidebar a.version{color:#9376D6;opacity:0.5}body section.sidebar div.footer div.link a:hover,body section.sidebar a.version:hover{color:#89C62A;opacity:1}body section.sidebar div.footer div.storage strong{color:#9376D6;opacity:0.5}body section.sidebar div.footer .bar em{background:#89C62A;height:3px}body section.sidebar div.footer .bar{background:#9376D6;height:3px}.pm_buttons,.pm_buttons a{color:#1D1E1A}.conversation.marked::before{background:#89C62A;width:5px}#pm_composer .composer header{background:#1D1E1A;color:#9376D6}p a{color:#89C62A}#pm_composer .composer footer .pm_button{background:#9376D6;color:#1D1E1A}#pm_composer .composer footer .pm_button:hover{background:#9376D6;color:#1D1E1A}#pm_composer .composer footer .pm_button.primary{background:#1D1E1A;color:#9376D6}#pm_composer .composer footer .pm_button.primary:hover{background:#89C62A;color:#9376D6}#pm_settings .pm_tabs{background:#e6eaf0}#pm_settings .pm_tabs li a.pm_button{color:#1D1E1A;border-color:#e6eaf0}#pm_settings .pm_tabs li a.pm_button:hover{color:#89C62A}#pm_settings .pm_tabs li.active a.pm_button{color:#89C62A}.pm_button.link{color:#89C62A}.pm_toggle.off .off,.pm_toggle.on .on{background:#1D1E1A;color:#9376D6}.alert.alert-info{background:#e6eaf0;color:#000}html.protonmail .text-purple{color:#89C62A}#pm_settings .bar em{background:#89C62A;height:4px}#pm_settings .bar{background:#1D1E1A;opacity:0.5;height:4px}#plans .plans .plan h3{background:#1D1E1A;color:#9376D6}#plans .plans .plan.plus-plan h3 span,#plans .plans .plan.visionary-plan h3 span,#plans .plans .plan.visionary-plan header{color:#9376D6}#plans .plans .plan footer .cycle strong{color:#89C62A}#plans .plans .plan footer .cycle .discount{border-color:transparent #89C62A transparent transparent}#plans .plans .plan footer .cycle .discount span{color:#9376D6}.pm_modal .modal-dialog{border-color:#1D1E1A}.pm_modal .modal-dialog .close{color:#9376D6;background:#1D1E1A}.pm_badge{color:#9376D6}.pm_badge.primary{background:#1D1E1A;color:#9376D6}.pm_badge.success{background:#89C62A;color:#9376D6}.pm_table table th a,.pm_table table th .fa{color:#89C62A}body .cg-notify-message.notification-success{background-color:#89C62A;color:#9376D6}
\ No newline at end of file
diff --git a/Themes/v3.7.3/theme_template/template_v3.7.3.scss b/Themes/v3.7.3/theme_template/template_v3.7.3.scss
deleted file mode 100644
index 7cc5369..0000000
--- a/Themes/v3.7.3/theme_template/template_v3.7.3.scss
+++ /dev/null
@@ -1,408 +0,0 @@
-/* =========================================== *
- * Template 3.7.3 THEME
- * Author: You name here
- * Website: Your website here
- * Tweets Your tweeter handle
- * =========================================== */
-
- // Change colors here and they will change everywhere.
-$base: #0d0d0d;
-$search: #000;
-$highlight: #2FBF71;
-$navigation: #fff;
-
-$text_color: #0d0d0d;
-$extra_color: #e6eaf0;
-
-// ================================= \\
-// ========== HORIZONTAL =========== \\
-// ========== NAVIGATION =========== \\
-// ============= BAR =============== \\
-// ================================= \\
-
-
-// Top Navigation BAR (horizontal)
-.headerDesktop-container {
-  background-color: $base;
-}
-
-.search-form-fieldset {
-  background: $search;
-} // Search bar.
-
-
-[class*="searchForm-action-button-"] {
-  color: $navigation;
-} // Search bar buttons.
-
-.searchForm-action-button-advanced:hover, .searchForm-action-button-toggle:hover {
-  background: $highlight;
-} // Search bar buttons hover.
-
-.customRadio-input:checked + .customRadio-mask {
-  box-shadow: inset 0 0 0 3px #fff,inset 0 0 0 10px $highlight;
-  border-color: $highlight;
-} // Advanced search menu.
-
-
-.pm_button.primary, .pm_button.primary:active {
-  color: $navigation;
-  background-color: $base;
-  border-color: $base;
-} // General buttons.
-
-.pm_button.primary:hover, .pm_button.primary:focus {
-  background-color: $search;
-  border-color: $search;
-}
-
-.navigation > li.active, .navigation > li:hover {
-  box-shadow: 0 5px 0 0 $highlight inset;
-} // Navigation top  color shadow
-
-.navigation-link {
-  color: $navigation;
-} // Navigation links including icons.
-
-.navigation-title:hover {
-  color: $highlight;
-} // Hover navigation links
-
-.pm_dropdown .navigationUser-logout {
-  background-color: $base !important;
-  border-color: $base !important;
-  color: $navigation !important;
-} // logout button hover
-
-.pm_dropdown .navigationUser-logout:hover {
-  background-color: $search !important;
-  border-color: $search !important;
-  color: $navigation !important;
-} // logout button hover
-
-.sidebar-btn-compose, .sidebar-btn-compose:active  {
-  color: $navigation !important;
-  background: $highlight !important;
-  border: none !important;
-} // compose button
-
-.sidebar-btn-compose:hover {
-  color: $navigation !important;
-  background: $highlight !important;
-  border: none !important;
-  // Covers button with darker hue of highlight
-  box-shadow: inset 0 400px 400px rgba(0,0,0,0.1);
-} // compose button
-
-// ================================= \\
-// =========== VERTICAL ============ \\
-// ========== NAVIGATION =========== \\
-// ============= BAR =============== \\
-// ================================= \\
-
-// Protonmail logo background.
-.headerDesktop-logo {
-  background-color: $base;
-}
-
-// Side Navigation background. (vertical)
-body section.sidebar {
-  background: $base;
-}
-
-// Composition button.
-body section.sidebar a.compose {
-  background: $highlight;
-  color: $navigation;
-}
-
-body section.sidebar a.compose:hover {
-  background: $navigation;
-  border-color: $navigation;
-  color: $base;
-}
-
-// Navigation items.
-body section.sidebar ul.menu li a {
-  color: $navigation;
-}
-
-// Navigation items on hover.
-body section.sidebar ul.menu li a:hover {
-  color: $highlight;
-}
-
-// Navigation items on active and on active hover.
-body section.sidebar ul.menu li.active a, body section.sidebar ul.menu li.active a {
-  color: $navigation;
-}
-
-// Navigation icons on active and on active hover.
-body section.sidebar ul.menu li.active a i.fa, body section.sidebar ul.menu li.active a i.fa:hover {
-  color: $highlight !important;
-  opacity: 1;
-}
-
-// Refresh icon.
-body section.sidebar ul.menu li a .fa-repeat {
-  color: $navigation;
-  opacity: 1;
-}
-
-// Navigation icons.
-body section.sidebar ul.menu li a i.fa {
-  color: $navigation;
-  opacity: 0.5;
-}
-
-// Navigation icons on hover.
-body section.sidebar ul.menu li a i.fa:hover, body section.sidebar ul.menu li a:hover i.fa {
-  color: $navigation;
-  opacity: 1;
-}
-
-// Number of messages.
-body section.sidebar ul.menu li a em {
-  color: $navigation;
-  opacity: 0.5;
-}
-
-// Label links.
-body section.sidebar div.labels ul li a {
-  color: $navigation;
-  opacity: 0.5;
-}
-
-// Label links on hover.
-body section.sidebar div.labels ul li a:hover {
-  color: $navigation;
-  opacity: 1;
-}
-
-// Storage links and version.
-body section.sidebar div.footer div.link a, body section.sidebar a.version {
-  color: $navigation;
-  opacity: 0.5;
-}
-
-// Storage links and version on hover.
-body section.sidebar div.footer div.link a:hover, body section.sidebar a.version:hover {
-  color: $highlight;
-  opacity: 1;
-}
-
-// Storage text.
-body section.sidebar div.footer div.storage strong {
-  color: $navigation;
-  opacity: 0.5;
-}
-
-// Storage bar fill.
-body section.sidebar div.footer .bar em {
-  background: $highlight;
-  height: 3px;
-}
-// Storage bar.
-body section.sidebar div.footer .bar {
-  background: $navigation;
-  height: 3px;
-}
-
-// ================================= \\
-// =========== MESSAGE ============ \\
-// ========== NAVIGATION =========== \\
-// ================================= \\
-
-// Toolbar icons.
-.pm_buttons, .pm_buttons a {
-  color: $base;
-}
-
-// Left border.
-.conversation.marked::before {
-  background: $highlight;
-  width: 5px;
-}
-
-// Unread message background.
-body #conversation-list-rows .conversation {
-
-}
-
-// Read message background.
-body #conversation-list-rows .conversation.read {
-
-}
-
-// ================================= \\
-// =========== COMPOSING =========== \\
-// ============ MESSAGE ============ \\
-// ============= WINDOW ============= \\
-// ================================= \\
-
-// Header color and text.
-#pm_composer .composer header {
-  background: $base;
-  color: $navigation;
-}
-
-// Links in general.
-p a {
-  color: $highlight;
-}
-
-// Attachment, encryption and expiration buttons.
-#pm_composer .composer footer .pm_button {
-  background: $navigation;
-  color: $base;
-}
-
-// Attachment, encryption and expiration buttons on hover.
-#pm_composer .composer footer .pm_button:hover {
-  background: $navigation;
-  color: $base;
-}
-
-// Send button.
-#pm_composer .composer footer .pm_button.primary {
-  background: $base;
-  color: $navigation;
-}
-
-// Send button on hover.
-#pm_composer .composer footer .pm_button.primary:hover {
-  background: $highlight;
-  color: $navigation;
-}
-
-// ================================= \\
-// =========== SETTINGS =========== \\
-// ============ PANEL ============ \\
-// ================================= \\
-
-// Tab menu background.
-#pm_settings .pm_tabs {
-  background: $extra_color;
-}
-
-// Tab menu items.
-#pm_settings .pm_tabs li a.pm_button {
-  color: $base;
-  border-color: $extra_color;
-}
-
-// Tab menu items hover.
-#pm_settings .pm_tabs li a.pm_button:hover {
-  color: $highlight;
-}
-
-// Tab menu active item.
-#pm_settings .pm_tabs li.active a.pm_button {
-  color: $highlight;
-}
-
-// Links in settings.
-.pm_button.link {
-  color: $highlight;
-}
-
-// Pill switch buttons.
-.pm_toggle.off .off, .pm_toggle.on .on {
-  background: $base;
-  color: $navigation;
-}
-
-.alert.alert-info {
-  background: $extra_color;
-  color: #000;
-}
-
-// Small icons in settings.
-html.protonmail .text-purple {
-  color: $highlight;
-}
-
-// Settings storage bar progress (fill).
-#pm_settings .bar em {
-  background: $highlight;
-  height: 4px;
-}
-// Settings storage bar.
-#pm_settings .bar {
-  background: $base;
-  opacity: 0.5;
-  height: 4px;
-}
-
-// Plans and donations.
-#plans .plans .plan h3 {
-  background: $base;
-  color: $navigation;
-}
-
-// Text on Plus and Visionary plan.
-#plans .plans .plan.plus-plan h3 span, #plans .plans .plan.visionary-plan h3 span, #plans .plans .plan.visionary-plan header {
-  color: $navigation;
-}
-
-// Pricing text.
-#plans .plans .plan footer .cycle strong {
-  color: $highlight;
-}
-
-// Discount tag background.
-#plans .plans .plan footer .cycle .discount {
-  border-color: transparent $highlight transparent transparent;
-}
-// Discount tag text.
-#plans .plans .plan footer .cycle .discount span {
-  color: $navigation;
-}
-
-// Pop-up color.
-.pm_modal .modal-dialog {
-  border-color: $base;
-}
-
-// Pop up close button.
-.pm_modal .modal-dialog .close {
-  color: $navigation;
-  background: $base;
-}
-
-// Address badges link
-.pm_badge {
-  color: $navigation;
-}
-
-// Address default badge.
-.pm_badge.primary {
-  background: $base;
-  color: $navigation;
-}
-
-// Address enalbled badge.
-.pm_badge.success {
-  background: $highlight;
-  color: $navigation;
-}
-
-// ================================= \\
-// =========== CONTACTS =========== \\
-// ============ PANEL ============= \\
-// ================================= \\
-
-// Contact table headings.
-.pm_table table th a, .pm_table table th .fa {
-  color: $highlight;
-}
-
-// ================================= \\
-// ============= OTHER ============= \\
-// ================================= \\
-
-//Top pop up notifications.
-body .cg-notify-message.notification-success {
-  background-color: $highlight;
-  color: $navigation;
-}