diff --git a/etc/xdg/kwinrc b/etc/xdg/kwinrc
index dae303ea..a1806eb9 100644
--- a/etc/xdg/kwinrc
+++ b/etc/xdg/kwinrc
@@ -1,6 +1,6 @@
[org.kde.kdecoration2]
-library=org.kde.kwin.aurorae
-theme=__aurorae__svg__Kali-Dark
+library=org.kali.kali
+theme=Kali
[Desktops]
Number=2
diff --git a/share/aurorae/themes/Kali-Dark/Kali-Darkrc b/share/aurorae/themes/Kali-Dark/Kali-Darkrc
deleted file mode 100644
index 3bab56cd..00000000
--- a/share/aurorae/themes/Kali-Dark/Kali-Darkrc
+++ /dev/null
@@ -1,43 +0,0 @@
-[General]
-ActiveFocusedTabColor=78,78,78
-ActiveTextColor=255,255,255
-ActiveTextShadowColor=255,255,255,255
-ActiveUnfocusedTabColor=120,120,120
-Animation=0
-InactiveFocusedTabColor=120,120,120
-InactiveTextColor=120,120,120
-InactiveTextShadowColor=255,255,255,255
-InactiveUnfocusedTabColor=120,120,120
-LeftButtons=XIA
-RightButtons=
-Shadow=false
-TextShadowOffsetX=1
-TextShadowOffsetY=1
-TitleAlignment=Center
-TitleVerticalAlignment=Center
-UseTextShadow=true
-
-[Layout]
-#BorderBottom=0
-#BorderLeft=0
-#BorderRight=0
-ButtonMarginTop=0
-ButtonSpacing=8
-ButtonWidth=13
-ButtonHeight=13
-ExplicitButtonSpacer=0
-PaddingBottom=89
-PaddingLeft=78
-PaddingRight=78
-PaddingTop=38
-TitleBorderLeft=1
-TitleBorderRight=1
-TitleEdgeBottom=4
-TitleEdgeBottomMaximized=4
-TitleEdgeLeft=8
-TitleEdgeLeftMaximized=8
-TitleEdgeRight=8
-TitleEdgeRightMaximized=8
-TitleEdgeTop=4
-TitleEdgeTopMaximized=4
-TitleHeight=15
diff --git a/share/aurorae/themes/Kali-Dark/alldesktops.svg b/share/aurorae/themes/Kali-Dark/alldesktops.svg
deleted file mode 100644
index b385ff95..00000000
--- a/share/aurorae/themes/Kali-Dark/alldesktops.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-
diff --git a/share/aurorae/themes/Kali-Dark/close.svg b/share/aurorae/themes/Kali-Dark/close.svg
deleted file mode 100644
index 261f73cf..00000000
--- a/share/aurorae/themes/Kali-Dark/close.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-
diff --git a/share/aurorae/themes/Kali-Dark/decoration.svg b/share/aurorae/themes/Kali-Dark/decoration.svg
deleted file mode 100644
index 671e2643..00000000
--- a/share/aurorae/themes/Kali-Dark/decoration.svg
+++ /dev/null
@@ -1,109 +0,0 @@
-
diff --git a/share/aurorae/themes/Kali-Dark/keepabove.svg b/share/aurorae/themes/Kali-Dark/keepabove.svg
deleted file mode 100644
index 7219640e..00000000
--- a/share/aurorae/themes/Kali-Dark/keepabove.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-
diff --git a/share/aurorae/themes/Kali-Dark/keepbelow.svg b/share/aurorae/themes/Kali-Dark/keepbelow.svg
deleted file mode 100644
index f506d17b..00000000
--- a/share/aurorae/themes/Kali-Dark/keepbelow.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-
diff --git a/share/aurorae/themes/Kali-Dark/maximize.svg b/share/aurorae/themes/Kali-Dark/maximize.svg
deleted file mode 100644
index 9dcf2ae5..00000000
--- a/share/aurorae/themes/Kali-Dark/maximize.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-
diff --git a/share/aurorae/themes/Kali-Dark/metadata.desktop b/share/aurorae/themes/Kali-Dark/metadata.desktop
deleted file mode 100644
index 53bb375f..00000000
--- a/share/aurorae/themes/Kali-Dark/metadata.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Name=Kali-Dark
diff --git a/share/aurorae/themes/Kali-Dark/minimize.svg b/share/aurorae/themes/Kali-Dark/minimize.svg
deleted file mode 100644
index 3663d3e0..00000000
--- a/share/aurorae/themes/Kali-Dark/minimize.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-
diff --git a/share/aurorae/themes/Kali-Dark/restore.svg b/share/aurorae/themes/Kali-Dark/restore.svg
deleted file mode 100644
index 9dcf2ae5..00000000
--- a/share/aurorae/themes/Kali-Dark/restore.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-
diff --git a/share/aurorae/themes/Kali-Light/Kali-Lightrc b/share/aurorae/themes/Kali-Light/Kali-Lightrc
deleted file mode 100644
index ab28645f..00000000
--- a/share/aurorae/themes/Kali-Light/Kali-Lightrc
+++ /dev/null
@@ -1,43 +0,0 @@
-[General]
-ActiveFocusedTabColor=78,78,78
-ActiveTextColor=0,0,0
-ActiveTextShadowColor=255,255,255,255
-ActiveUnfocusedTabColor=120,120,120
-Animation=0
-InactiveFocusedTabColor=120,120,120
-InactiveTextColor=120,120,120
-InactiveTextShadowColor=255,255,255,255
-InactiveUnfocusedTabColor=120,120,120
-LeftButtons=XIA
-RightButtons=
-Shadow=false
-TextShadowOffsetX=1
-TextShadowOffsetY=1
-TitleAlignment=Center
-TitleVerticalAlignment=Center
-UseTextShadow=true
-
-[Layout]
-#BorderBottom=0
-#BorderLeft=0
-#BorderRight=0
-ButtonMarginTop=0
-ButtonSpacing=8
-ButtonWidth=13
-ButtonHeight=13
-ExplicitButtonSpacer=0
-PaddingBottom=89
-PaddingLeft=78
-PaddingRight=78
-PaddingTop=38
-TitleBorderLeft=1
-TitleBorderRight=1
-TitleEdgeBottom=4
-TitleEdgeBottomMaximized=4
-TitleEdgeLeft=8
-TitleEdgeLeftMaximized=8
-TitleEdgeRight=8
-TitleEdgeRightMaximized=8
-TitleEdgeTop=4
-TitleEdgeTopMaximized=4
-TitleHeight=15
diff --git a/share/aurorae/themes/Kali-Light/alldesktops.svg b/share/aurorae/themes/Kali-Light/alldesktops.svg
deleted file mode 100644
index 544ebee2..00000000
--- a/share/aurorae/themes/Kali-Light/alldesktops.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-
diff --git a/share/aurorae/themes/Kali-Light/close.svg b/share/aurorae/themes/Kali-Light/close.svg
deleted file mode 100644
index 9581671d..00000000
--- a/share/aurorae/themes/Kali-Light/close.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-
diff --git a/share/aurorae/themes/Kali-Light/decoration.svg b/share/aurorae/themes/Kali-Light/decoration.svg
deleted file mode 100644
index f9cce1ed..00000000
--- a/share/aurorae/themes/Kali-Light/decoration.svg
+++ /dev/null
@@ -1,109 +0,0 @@
-
diff --git a/share/aurorae/themes/Kali-Light/keepabove.svg b/share/aurorae/themes/Kali-Light/keepabove.svg
deleted file mode 100644
index f99fa796..00000000
--- a/share/aurorae/themes/Kali-Light/keepabove.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-
diff --git a/share/aurorae/themes/Kali-Light/keepbelow.svg b/share/aurorae/themes/Kali-Light/keepbelow.svg
deleted file mode 100644
index 782ad73d..00000000
--- a/share/aurorae/themes/Kali-Light/keepbelow.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-
diff --git a/share/aurorae/themes/Kali-Light/maximize.svg b/share/aurorae/themes/Kali-Light/maximize.svg
deleted file mode 100644
index 5b1aad62..00000000
--- a/share/aurorae/themes/Kali-Light/maximize.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-
diff --git a/share/aurorae/themes/Kali-Light/metadata.desktop b/share/aurorae/themes/Kali-Light/metadata.desktop
deleted file mode 100644
index 9b2e83b4..00000000
--- a/share/aurorae/themes/Kali-Light/metadata.desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-[Desktop Entry]
-Name=Kali-Light
diff --git a/share/aurorae/themes/Kali-Light/minimize.svg b/share/aurorae/themes/Kali-Light/minimize.svg
deleted file mode 100644
index 1b350154..00000000
--- a/share/aurorae/themes/Kali-Light/minimize.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-
diff --git a/share/aurorae/themes/Kali-Light/restore.svg b/share/aurorae/themes/Kali-Light/restore.svg
deleted file mode 100644
index 5b1aad62..00000000
--- a/share/aurorae/themes/Kali-Light/restore.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-
diff --git a/share/plasma/look-and-feel/Kali-Dark/contents/defaults b/share/plasma/look-and-feel/Kali-Dark/contents/defaults
index f8cfbe5d..dded2160 100644
--- a/share/plasma/look-and-feel/Kali-Dark/contents/defaults
+++ b/share/plasma/look-and-feel/Kali-Dark/contents/defaults
@@ -2,8 +2,8 @@
ColorScheme=KaliDark
[kwinrc][org.kde.kdecoration2]
-library=org.kde.kwin.aurorae
-theme=__aurorae__svg__Kali-Dark
+library=org.kali.kali
+theme=Kali
[kdeglobals][Icons]
Theme=Flat-Remix-Blue-Dark
diff --git a/share/plasma/look-and-feel/Kali-Light/contents/defaults b/share/plasma/look-and-feel/Kali-Light/contents/defaults
index 05f16732..bd4a9e9a 100644
--- a/share/plasma/look-and-feel/Kali-Light/contents/defaults
+++ b/share/plasma/look-and-feel/Kali-Light/contents/defaults
@@ -2,8 +2,8 @@
ColorScheme=KaliLight
[kwinrc][org.kde.kdecoration2]
-library=org.kde.kwin.aurorae
-theme=__aurorae__svg__Kali-Light
+library=org.kali.kali
+theme=Kali
[kdeglobals][Icons]
Theme=Flat-Remix-Blue-Light