diff --git a/debian/control b/debian/control
index 739efe07..a80f410b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,13 @@ Source: kali-themes
 Section: misc
 Priority: optional
 Maintainer: Kali Developers <devel@kali.org>
-Uploaders: Daniel Ruiz de Alegría <daniruiz@kali.org>,
-           Raphaël Hertzog <raphael@offensive-security.com>,
-Build-Depends: debhelper-compat (= 12),
-               librsvg2-bin,
-               optipng,
+Uploaders:
+ Daniel Ruiz de Alegría <daniruiz@kali.org>,
+ Raphaël Hertzog <raphael@offensive-security.com>,
+Build-Depends:
+ debhelper-compat (= 12),
+ librsvg2-bin,
+ optipng,
 Standards-Version: 4.6.0
 Rules-Requires-Root: no
 Vcs-Git: https://gitlab.com/kalilinux/packages/kali-themes.git
@@ -14,23 +16,26 @@ Vcs-Browser: https://gitlab.com/kalilinux/packages/kali-themes
 
 Package: kali-themes-common
 Architecture: all
-Depends: ${misc:Depends},
-# Dependency on the package providing the current default background
-         kali-wallpapers-2022,
-Suggests: gtk2-engines-pixbuf,
-          librsvg2-common,
-# List old wallpapers so that they are not auto-removed on upgrade
-          kali-wallpapers-2020.4,
-          kali-wallpapers-2019.4,
-          kali-wallpapers-legacy
-Breaks: gnome-theme-kali (<< 2019.4),
-        desktop-base (<< 10.0.3+kali2),
-        kali-menu (<< 2021.3.2),
-        kali-desktop-kde (<< 2021.4.1),
-Replaces: gnome-theme-kali (<< 2019.4),
-          desktop-base (<< 10.0.3+kali2),
-          kali-menu (<< 2021.3.2),
-Provides: gnome-theme-kali
+Depends:
+ kali-wallpapers-2022,
+ ${misc:Depends},
+Suggests:
+ gtk2-engines-pixbuf,
+ kali-wallpapers-2019.4,
+ kali-wallpapers-2020.4,
+ kali-wallpapers-legacy,
+ librsvg2-common,
+Breaks:
+ desktop-base (<< 10.0.3+kali2),
+ gnome-theme-kali (<< 2019.4),
+ kali-desktop-kde (<< 2021.4.1),
+ kali-menu (<< 2021.3.2),
+Replaces:
+ desktop-base (<< 10.0.3+kali2),
+ gnome-theme-kali (<< 2019.4),
+ kali-menu (<< 2021.3.2),
+Provides:
+ gnome-theme-kali,
 Description: Kali Themes (data files)
  This package contains multiple themes for kali. It includes graphical toolkit
  themes, icon themes, color schemes, desktop backgrounds and more.
@@ -40,8 +45,9 @@ Description: Kali Themes (data files)
 
 Package: kali-desktop-base
 Architecture: all
-Depends: ${misc:Depends},
-         kali-themes-common (= ${source:Version}),
+Depends:
+ kali-themes-common (= ${source:Version}),
+ ${misc:Depends},
 Description: Kali version of Debian's desktop-base package
  This empty package provides hooks into the various alternatives defined by
  Debian's desktop-base to provide consistent Kali branding through the whole
@@ -50,21 +56,20 @@ Description: Kali version of Debian's desktop-base package
 Package: kali-themes
 Architecture: all
 Depends:
- kali-themes-common (= ${source:Version}),
-# gsettings and other config files reference those fonts
  fonts-cantarell,
  fonts-firacode,
-# Engines for GTK and icon themes
  gtk2-engines-pixbuf,
+ kali-themes-common (= ${source:Version}),
  librsvg2-common,
-# For boot-time splash screen
  plymouth-label,
- ${misc:Depends}
-Breaks: kali-defaults (<< 2019.4.0),
-        kali-desktop-xfce (<< 2020.2.18),
-        gnome-shell (<< 40.2),
-        kali-menu (<< 2019.4.4),
-Replaces: kali-defaults (<< 2019.4.0)
+ ${misc:Depends},
+Breaks:
+ gnome-shell (<< 40.2),
+ kali-defaults (<< 2019.4.0),
+ kali-desktop-xfce (<< 2020.2.18),
+ kali-menu (<< 2019.4.4),
+Replaces:
+ kali-defaults (<< 2019.4.0),
 Description: Configure all desktops to use the Kali theme
  Installing this package should configure most desktops to use the Kali theme
  by default.
@@ -76,8 +81,9 @@ Description: Configure all desktops to use the Kali theme
 Package: gnome-theme-kali
 Section: oldlibs
 Architecture: all
-Depends: ${misc:Depends},
-         kali-themes,
+Depends:
+ kali-themes,
+ ${misc:Depends},
 Description: Transitional package to install kali-themes
  All the theme related files have been moved to kali-themes.
  .
diff --git a/debian/kali-themes-common.install b/debian/kali-themes-common.install
index afc62145..90298746 100644
--- a/debian/kali-themes-common.install
+++ b/debian/kali-themes-common.install
@@ -1,4 +1,4 @@
-share/* usr/share/
 # Those are created by "make install"
+share/* usr/share/
 usr/share/icons/
 usr/share/images/
diff --git a/debian/kali-themes.install b/debian/kali-themes.install
index 377a0a47..27152fb0 100644
--- a/debian/kali-themes.install
+++ b/debian/kali-themes.install
@@ -1,2 +1,2 @@
-etc
 .face-root.svg usr/share/kali-themes
+etc