diff --git a/static/images/city.jpg b/static/images/city.jpg
deleted file mode 100644
index 75c07b5b..00000000
Binary files a/static/images/city.jpg and /dev/null differ
diff --git a/static/static/styles.json b/static/static/styles.json
index 038e6173..bb7525da 100644
--- a/static/static/styles.json
+++ b/static/static/styles.json
@@ -1,5 +1,5 @@
 {
-  "envs-dark": "/static/themes/envs-dark-theme.json",
+  "envs-dark": "/static/themes/envs-dark.json",
 
   "pleroma-dark": "/static/themes/pleroma-dark.json",
   "pleroma-light": "/static/themes/pleroma-light.json",
@@ -14,6 +14,7 @@
   "redmond-xxi": "/static/themes/redmond-xxi.json",
   "breezy-dark": "/static/themes/breezy-dark.json",
   "breezy-light": "/static/themes/breezy-light.json",
-  "mammal": "/static/themes/mammal.json",
-  "paper": "/static/themes/paper.json"
+  "ihatebeingalive": "/static/themes/ihatebeingalive.json",
+  "paper": "/static/themes/paper.json",
+  "thekanata": "/static/themes/thekanata.json"
 }
diff --git a/static/static/themes/envs-dark-theme.json b/static/static/themes/envs-dark.json
similarity index 86%
rename from static/static/themes/envs-dark-theme.json
rename to static/static/themes/envs-dark.json
index 299f7f19..9c5d86e4 100644
--- a/static/static/themes/envs-dark-theme.json
+++ b/static/static/themes/envs-dark.json
@@ -1,44 +1,44 @@
 {
   "_pleroma_theme_version": 2,
-  "name": "ENVS Dark",
+  "name": "envs.net",
   "theme": {
     "themeEngineVersion": 3,
     "shadows": {
       "panel": [
         {
+          "color": "#000000",
           "x": "0",
           "y": "0",
           "blur": "3",
           "spread": 0,
-          "color": "#000000",
           "alpha": "0.5"
         },
         {
+          "color": "#000000",
           "x": "0",
           "y": "4",
           "blur": "6",
           "spread": "3",
           "inset": false,
-          "color": "#000000",
           "alpha": "0.3"
         }
       ],
       "topBar": [
         {
+          "color": "#000000",
           "x": 0,
           "y": "1",
           "blur": 4,
           "spread": 0,
-          "color": "#000000",
           "alpha": "0.4"
         },
         {
+          "color": "#000000",
           "x": 0,
           "y": "2",
           "blur": "7",
           "spread": 0,
           "inset": false,
-          "color": "#000000",
           "alpha": "0.3"
         }
       ],
@@ -65,116 +65,116 @@
       "avatarStatus": [],
       "panelHeader": [
         {
+          "color": "#000000",
           "x": 0,
           "y": "1",
           "blur": "3",
           "spread": 0,
           "inset": false,
-          "color": "#000000",
           "alpha": "0.4"
         },
         {
+          "color": "#ffffff",
           "x": "0",
           "y": "1",
           "blur": "0",
           "spread": 0,
           "inset": true,
-          "color": "#ffffff",
           "alpha": "0.2"
         }
       ],
       "button": [
         {
+          "color": "#000000",
           "x": 0,
           "y": 0,
           "blur": 2,
           "spread": 0,
-          "color": "#000000",
           "alpha": 1
         },
         {
+          "color": "#FFFFFF",
           "x": 0,
           "y": 1,
           "blur": 0,
           "spread": 0,
-          "color": "#FFFFFF",
           "alpha": 0.2,
           "inset": true
         },
         {
+          "color": "#000000",
           "x": 0,
           "y": -1,
           "blur": 0,
           "spread": 0,
-          "color": "#000000",
           "alpha": 0.2,
           "inset": true
         }
       ],
       "buttonHover": [
         {
+          "color": "#b9b9ba",
           "x": 0,
           "y": 0,
           "blur": "1",
           "spread": "2",
-          "color": "#b9b9ba",
           "alpha": "0.4",
           "inset": true
         },
         {
+          "color": "#FFFFFF",
           "x": 0,
           "y": 1,
           "blur": 0,
           "spread": 0,
-          "color": "#FFFFFF",
           "alpha": 0.2,
           "inset": true
         },
         {
+          "color": "#000000",
           "x": 0,
           "y": -1,
           "blur": 0,
           "spread": 0,
-          "color": "#000000",
           "alpha": 0.2,
           "inset": true
         }
       ],
       "buttonPressed": [
         {
+          "color": "#000000",
           "x": 0,
           "y": 0,
           "blur": 4,
           "spread": 0,
-          "color": "#000000",
           "alpha": 1,
           "inset": true
         },
         {
+          "color": "#000000",
           "x": 0,
           "y": 1,
           "blur": 0,
           "spread": 0,
-          "color": "#000000",
           "alpha": 0.2,
           "inset": true
         },
         {
+          "color": "#FFFFFF",
           "x": 0,
           "y": -1,
           "blur": 0,
           "spread": 0,
-          "color": "#FFFFFF",
           "alpha": 0.2,
           "inset": true
         },
         {
+          "color": "#000000",
           "x": 0,
           "y": 0,
           "blur": "2",
           "spread": 0,
           "inset": false,
-          "color": "#000000",
           "alpha": 1
         }
       ],
@@ -213,25 +213,36 @@
       "bg": "#0f161e",
       "fg": "#151e2b",
       "cRed": "#d31014",
-      "cOrange": "#ffc459",
       "cGreen": "#5dc94a",
+      "cOrange": "#ffc459",
       "cBlue": "#81beea",
-      "accent": "#d8a070",
-      "link": "#d8a070",
+      "accent": "#10a0a0",
+      "link": "#10a0a0",
       "text": "#b9b9ba",
       "badgeNotification": "#e15932",
       "badgeNotificationText": "#ffffff",
+      "alertNeutral": "#b9b9ba",
+      "alertNeutralText": "#ffffff",
+      "alertPopupNeutral": "#b9b9ba",
+      "alertPopupNeutralText": "#000000",
+      "alertSuccess": "#5dc94a",
+      "alertSuccessText": "#ffffff",
+      "alertPopupSuccess": "#5dc94a",
+      "alertPopupSuccessText": "#000000",
+      "alertWarning": "#ffc459",
+      "alertWarningText": "#ffffff",
+      "alertPopupWarning": "#ffc459",
+      "alertPopupWarningText": "#000000",
+      "alertError": "#d31014",
+      "alertErrorText": "#f0f0f0",
+      "alertPopupError": "#d31014",
+      "alertPopupErrorText": "#f0f0f0",
       "panel": "#151e2b",
       "panelText": "#b9b9ba",
-      "alertNeutral": "#b9b9ba",
       "alertNeutralPanelText": "#ffffff",
-      "alertNeutralText": "#ffffff",
-      "alertWarning": "#ffc459",
+      "alertSuccessPanelText": "#ffffff",
       "alertWarningPanelText": "#ffffff",
-      "alertWarningText": "#ffffff",
-      "alertError": "#d31014",
       "alertErrorPanelText": "#b9b9ba",
-      "alertErrorText": "#f0f0f0",
       "fgText": "#b9b9ba",
       "topBar": "#151e2b",
       "topBarText": "#a0a0a2",
@@ -247,10 +258,10 @@
       "btnPanelText": "#b9b9ba",
       "btnDisabledPanelText": "#3b4148",
       "btnDisabledText": "#3b4148",
-      "btnToggled": "#a1622c",
-      "btnToggledTopBarText": "#ffffff",
-      "btnToggledPanelText": "#ffffff",
-      "btnToggledText": "#ffffff",
+      "btnToggled": "#053030",
+      "btnToggledTopBarText": "#b9b9ba",
+      "btnToggledPanelText": "#b9b9ba",
+      "btnToggledText": "#b9b9ba",
       "btnPressed": "#151e2b",
       "btnPressedTopBarText": "#b9b9ba",
       "btnPressedTopBar": "#151e2b",
@@ -260,15 +271,17 @@
       "tabActiveText": "#b9b9ba",
       "tabText": "#b9b9ba",
       "tab": "#151e2b",
-      "fgLink": "#d8a070",
-      "topBarLink": "#d8a070",
-      "panelLink": "#d8a070",
+      "fgLink": "#10a0a0",
+      "topBarLink": "#a0a0a2",
+      "panelLink": "#10a0a0",
       "panelFaint": "#b9b9ba",
       "icon": "#64686c",
-      "poll": "#604e3f",
-      "pollText": "#ffffff",
+      "poll": "#104e52",
+      "pollText": "#b9b9ba",
       "border": "#1b2636",
-      "postLink": "#d8a070",
+      "postCyantext": "#81beea",
+      "postGreentext": "#5dc94a",
+      "postLink": "#10a0a0",
       "lightText": "#ededed",
       "popover": "#0f161e",
       "selectedMenuPopover": "#18232f",
@@ -277,14 +290,14 @@
       "selectedMenu": "#18232f",
       "selectedMenuText": "#b9b9ba",
       "selectedMenuPopoverIcon": "#696e75",
-      "highlightLink": "#d8a070",
-      "selectedMenuLink": "#d8a070",
-      "selectedMenuPopoverLink": "#d8a070",
+      "highlightLink": "#10a0a0",
+      "selectedMenuLink": "#10a0a0",
+      "selectedMenuPopoverLink": "#10a0a0",
       "selectedMenuPopoverText": "#b9b9ba",
-      "faintLink": "#d8a070",
-      "highlightFaintLink": "#d8a070",
-      "selectedMenuFaintLink": "#d8a070",
-      "selectedMenuPopoverFaintLink": "#d8a070",
+      "faintLink": "#10a0a0",
+      "highlightFaintLink": "#10a0a0",
+      "selectedMenuFaintLink": "#10a0a0",
+      "selectedMenuPopoverFaintLink": "#10a0a0",
       "faint": "#b9b9ba",
       "highlightFaintText": "#b9b9ba",
       "selectedMenuFaintText": "#b9b9ba",
@@ -296,31 +309,33 @@
       "selectedPost": "#18232f",
       "selectedPostText": "#b9b9ba",
       "selectedPostIcon": "#696e75",
-      "selectedPostLink": "#d8a070",
-      "selectedPostFaintLink": "#d8a070",
-      "highlightPostLink": "#d8a070",
-      "selectedPostPostLink": "#d8a070",
+      "selectedPostLink": "#10a0a0",
+      "selectedPostFaintLink": "#10a0a0",
+      "highlightPostLink": "#10a0a0",
+      "selectedPostPostLink": "#10a0a0",
       "selectedPostLightText": "#ededed",
       "selectedPostFaintText": "#b9b9ba",
       "popoverText": "#b9b9ba",
       "popoverIcon": "#64686c",
-      "popoverLink": "#d8a070",
-      "postFaintLink": "#d8a070",
-      "popoverPostFaintLink": "#d8a070",
-      "popoverFaintLink": "#d8a070",
+      "popoverLink": "#10a0a0",
+      "postFaintLink": "#10a0a0",
+      "popoverPostFaintLink": "#10a0a0",
+      "popoverFaintLink": "#10a0a0",
       "popoverFaintText": "#b9b9ba",
-      "popoverPostLink": "#d8a070",
+      "popoverPostLink": "#10a0a0",
       "popoverLightText": "#ededed",
       "highlightIcon": "#696e75",
-      "highlightPostFaintLink": "#d8a070",
+      "highlightPostFaintLink": "#10a0a0",
       "profileTint": "#0f161e",
-      "profileBg": "#070c11"
+      "profileBg": "#070c11",
+      "wallpaper": "#0c1118"
     },
     "opacity": {
       "underlay": 0.6,
       "bg": 1,
-      "panel": 1,
       "alert": 0.5,
+      "alertPopup": 0.95,
+      "panel": 1,
       "input": 0.5,
       "btn": 1,
       "faint": 0.5,
@@ -519,14 +534,14 @@
       "fg": "#151e2b",
       "text": "#b9b9ba",
       "underlay": "#090e14",
-      "accent": "#d8a070",
+      "accent": "#10a0a0",
       "cBlue": "#81beea",
       "cRed": "#d31014",
       "cGreen": "#5dc94a",
       "cOrange": "#ffc459",
       "border": "--fg,3",
-      "fgLink": "#d8a070",
       "topBarText": "--text,-9.75",
+      "topBarLink": "--topBarText",
       "btnToggled": "--accent,-24.2",
       "alertErrorText": "--text,21.2",
       "badgeNotification": "#e15932",