diff --git a/app-misc/geoclue/metadata.xml b/app-misc/geoclue/metadata.xml
index af8eab126..015d7c55a 100644
--- a/app-misc/geoclue/metadata.xml
+++ b/app-misc/geoclue/metadata.xml
@@ -6,5 +6,5 @@
         <name>Mir Calculate</name>
         <description>Calculate Overlay</description>
     </maintainer>
-	<upstream><remote-id type="freedesktop-gitlab">geoclue/geoclue</remote-id></upstream>
+    <upstream><remote-id type="freedesktop-gitlab">geoclue/geoclue</remote-id></upstream>
 </pkgmetadata>
diff --git a/dev-python/sjcl/metadata.xml b/dev-python/sjcl/metadata.xml
index 8678e837c..be3ca6500 100644
--- a/dev-python/sjcl/metadata.xml
+++ b/dev-python/sjcl/metadata.xml
@@ -6,8 +6,8 @@
         <name>Mir Calculate</name>
         <description>Calculate Overlay</description>
     </maintainer>
-	<upstream>
-		<remote-id type="github">berlincode/sjcl</remote-id>
-		<remote-id type="pypi">sjcl</remote-id>
-	</upstream>
+    <upstream>
+        <remote-id type="github">berlincode/sjcl</remote-id>
+        <remote-id type="pypi">sjcl</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/gnome-extra/yad/metadata.xml b/gnome-extra/yad/metadata.xml
index 3321533e0..b477b78eb 100644
--- a/gnome-extra/yad/metadata.xml
+++ b/gnome-extra/yad/metadata.xml
@@ -6,5 +6,5 @@
         <name>Mir Calculate</name>
         <description>Calculate Overlay</description>
     </maintainer>
-	<upstream><remote-id type="github">v1cont/yad</remote-id></upstream>
+    <upstream><remote-id type="github">v1cont/yad</remote-id></upstream>
 </pkgmetadata>
diff --git a/media-fonts/noto-emoji/metadata.xml b/media-fonts/noto-emoji/metadata.xml
index 275dcc538..ef0e44f19 100644
--- a/media-fonts/noto-emoji/metadata.xml
+++ b/media-fonts/noto-emoji/metadata.xml
@@ -6,5 +6,5 @@
         <name>Mir Calculate</name>
         <description>Calculate Overlay</description>
     </maintainer>
-	<upstream><remote-id type="github">googlefonts/noto-emoji</remote-id></upstream>
+    <upstream><remote-id type="github">googlefonts/noto-emoji</remote-id></upstream>
 </pkgmetadata>
diff --git a/media-gfx/gfxboot/metadata.xml b/media-gfx/gfxboot/metadata.xml
index 17d25c4a4..ff49ca5e5 100644
--- a/media-gfx/gfxboot/metadata.xml
+++ b/media-gfx/gfxboot/metadata.xml
@@ -6,5 +6,5 @@
         <name>Mir Calculate</name>
         <description>Calculate Overlay</description>
     </maintainer>
-	<upstream><remote-id type="launchpad">gfxboot-theme-ubuntu</remote-id></upstream>
+    <upstream><remote-id type="launchpad">gfxboot-theme-ubuntu</remote-id></upstream>
 </pkgmetadata>
diff --git a/net-im/rocketchat-desktop/metadata.xml b/net-im/rocketchat-desktop/metadata.xml
index 67f7c1c83..95ff7f58b 100644
--- a/net-im/rocketchat-desktop/metadata.xml
+++ b/net-im/rocketchat-desktop/metadata.xml
@@ -6,5 +6,5 @@
         <name>Mir Calculate</name>
         <description>Calculate Overlay</description>
     </maintainer>
-	<upstream><remote-id type="github">RocketChat/Rocket.Chat.Electron</remote-id></upstream>
+    <upstream><remote-id type="github">RocketChat/Rocket.Chat.Electron</remote-id></upstream>
 </pkgmetadata>
diff --git a/net-p2p/torrserver-bin/metadata.xml b/net-p2p/torrserver-bin/metadata.xml
index 679e3bbfa..74502066f 100644
--- a/net-p2p/torrserver-bin/metadata.xml
+++ b/net-p2p/torrserver-bin/metadata.xml
@@ -6,5 +6,5 @@
         <name>Mir Calculate</name>
         <description>Calculate Overlay</description>
     </maintainer>
-	<upstream><remote-id type="github">YouROK/TorrServer</remote-id></upstream>
+    <upstream><remote-id type="github">YouROK/TorrServer</remote-id></upstream>
 </pkgmetadata>
diff --git a/net-vpn/networkmanager-wireguard/metadata.xml b/net-vpn/networkmanager-wireguard/metadata.xml
index 2337ece98..853d6769c 100644
--- a/net-vpn/networkmanager-wireguard/metadata.xml
+++ b/net-vpn/networkmanager-wireguard/metadata.xml
@@ -6,5 +6,5 @@
         <name>Mir Calculate</name>
         <description>Calculate Overlay</description>
     </maintainer>
-	<upstream><remote-id type="github">max-moser/network-manager-wireguard</remote-id></upstream>
+    <upstream><remote-id type="github">max-moser/network-manager-wireguard</remote-id></upstream>
 </pkgmetadata>
diff --git a/net-wireless/rtl8814au/metadata.xml b/net-wireless/rtl8814au/metadata.xml
index 62f770675..646ede832 100644
--- a/net-wireless/rtl8814au/metadata.xml
+++ b/net-wireless/rtl8814au/metadata.xml
@@ -6,5 +6,5 @@
         <name>Mir Calculate</name>
         <description>Calculate Overlay</description>
     </maintainer>
-	<upstream><remote-id type="github">morrownr/8814au</remote-id></upstream>
+    <upstream><remote-id type="github">morrownr/8814au</remote-id></upstream>
 </pkgmetadata>
diff --git a/net-wireless/rtl8821ce/metadata.xml b/net-wireless/rtl8821ce/metadata.xml
index 5a25aaa3d..89a8b50dd 100644
--- a/net-wireless/rtl8821ce/metadata.xml
+++ b/net-wireless/rtl8821ce/metadata.xml
@@ -6,5 +6,5 @@
         <name>Mir Calculate</name>
         <description>Calculate Overlay</description>
     </maintainer>
-	<upstream><remote-id type="github">tomaspinho/rtl8821ce</remote-id></upstream>
+    <upstream><remote-id type="github">tomaspinho/rtl8821ce</remote-id></upstream>
 </pkgmetadata>
diff --git a/net-wireless/rtl8821cu/metadata.xml b/net-wireless/rtl8821cu/metadata.xml
index b4c93298f..e2ccdacc6 100644
--- a/net-wireless/rtl8821cu/metadata.xml
+++ b/net-wireless/rtl8821cu/metadata.xml
@@ -6,5 +6,5 @@
         <name>Mir Calculate</name>
         <description>Calculate Overlay</description>
     </maintainer>
-	<upstream><remote-id type="github">eltonlika/rtl8821CU</remote-id></upstream>
+    <upstream><remote-id type="github">eltonlika/rtl8821CU</remote-id></upstream>
 </pkgmetadata>
diff --git a/sys-apps/calculate-utils/metadata.xml b/sys-apps/calculate-utils/metadata.xml
index 56f385399..f40161286 100644
--- a/sys-apps/calculate-utils/metadata.xml
+++ b/sys-apps/calculate-utils/metadata.xml
@@ -6,20 +6,20 @@
         <name>Mir Calculate</name>
         <description>Calculate Overlay</description>
     </maintainer>
-	<longdescription lang="en">
-A set of Calculate utilities for system installation, build and upgrade.
-</longdescription>
-	<use>
-		<flag name="backup">Includes backup module.</flag>
-		<flag name="client">Includes module for setting and storing the user accounts in the domain.</flag>
-		<flag name="console">Includes console module.</flag>
-		<flag name="desktop">Includes module for desktop configuration.</flag>
-		<flag name="install">Enables support for disk installation.</flag>
-		<flag name="minimal">Use minimal depends for calculate install.</flag>
-		<flag name="pxe">Enables support for PXE installation.</flag>
-		<flag name="dbus">Enables ability to run core server by dbus.</flag>
-		<flag name="qt5">Include Qt5 gui console</flag>
-		<flag name="gpg">Enables the signature checking</flag>
-	</use>
+    <longdescription lang="en">
+        A set of Calculate utilities for system installation, build and upgrade.
+    </longdescription>
+    <use>
+        <flag name="backup">Includes backup module.</flag>
+        <flag name="client">Includes module for setting and storing the user accounts in the domain.</flag>
+        <flag name="console">Includes console module.</flag>
+        <flag name="desktop">Includes module for desktop configuration.</flag>
+        <flag name="install">Enables support for disk installation.</flag>
+        <flag name="minimal">Use minimal depends for calculate install.</flag>
+        <flag name="pxe">Enables support for PXE installation.</flag>
+        <flag name="dbus">Enables ability to run core server by dbus.</flag>
+        <flag name="qt5">Include Qt5 gui console</flag>
+        <flag name="gpg">Enables the signature checking</flag>
+    </use>
 </pkgmetadata>
 
diff --git a/sys-boot/plymouth-calculate-plugin/metadata.xml b/sys-boot/plymouth-calculate-plugin/metadata.xml
index 006432c7e..d69c70e41 100644
--- a/sys-boot/plymouth-calculate-plugin/metadata.xml
+++ b/sys-boot/plymouth-calculate-plugin/metadata.xml
@@ -6,5 +6,5 @@
         <name>Mir Calculate</name>
         <description>Calculate Overlay</description>
     </maintainer>
-	<upstream><remote-id type="freedesktop-gitlab">plymouth/plymouth</remote-id></upstream>
+    <upstream><remote-id type="freedesktop-gitlab">plymouth/plymouth</remote-id></upstream>
 </pkgmetadata>
diff --git a/sys-boot/plymouth-openrc-plugin/metadata.xml b/sys-boot/plymouth-openrc-plugin/metadata.xml
index 5a04ccba7..777fbf409 100644
--- a/sys-boot/plymouth-openrc-plugin/metadata.xml
+++ b/sys-boot/plymouth-openrc-plugin/metadata.xml
@@ -6,5 +6,5 @@
         <name>Mir Calculate</name>
         <description>Calculate Overlay</description>
     </maintainer>
-	<upstream><remote-id type="github">Kangie/plymouth-openrc-plugin</remote-id></upstream>
+    <upstream><remote-id type="github">Kangie/plymouth-openrc-plugin</remote-id></upstream>
 </pkgmetadata>
diff --git a/www-apps/jackett-bin/metadata.xml b/www-apps/jackett-bin/metadata.xml
index 02ba42ad5..3f469dca4 100644
--- a/www-apps/jackett-bin/metadata.xml
+++ b/www-apps/jackett-bin/metadata.xml
@@ -6,5 +6,5 @@
         <name>Mir Calculate</name>
         <description>Calculate Overlay</description>
     </maintainer>
-	<upstream><remote-id type="github">Jackett/Jackett</remote-id></upstream>
+    <upstream><remote-id type="github">Jackett/Jackett</remote-id></upstream>
 </pkgmetadata>
diff --git a/x11-themes/claws-mail-theme-papirus/metadata.xml b/x11-themes/claws-mail-theme-papirus/metadata.xml
index 4517e5f5f..018c69941 100644
--- a/x11-themes/claws-mail-theme-papirus/metadata.xml
+++ b/x11-themes/claws-mail-theme-papirus/metadata.xml
@@ -6,5 +6,5 @@
         <name>Mir Calculate</name>
         <description>Calculate Overlay</description>
     </maintainer>
-	<upstream><remote-id type="github">PapirusDevelopmentTeam/papirus-claws-mail-theme</remote-id></upstream>
+    <upstream><remote-id type="github">PapirusDevelopmentTeam/papirus-claws-mail-theme</remote-id></upstream>
 </pkgmetadata>
diff --git a/x11-themes/elementary-xfce-icon-theme/metadata.xml b/x11-themes/elementary-xfce-icon-theme/metadata.xml
index e16c40014..79fe411f5 100644
--- a/x11-themes/elementary-xfce-icon-theme/metadata.xml
+++ b/x11-themes/elementary-xfce-icon-theme/metadata.xml
@@ -6,5 +6,5 @@
         <name>Mir Calculate</name>
         <description>Calculate Overlay</description>
     </maintainer>
-	<upstream><remote-id type="github">shimmerproject/elementary-xfce</remote-id></upstream>
+    <upstream><remote-id type="github">shimmerproject/elementary-xfce</remote-id></upstream>
 </pkgmetadata>
diff --git a/x11-themes/papirus-libreoffice-theme/metadata.xml b/x11-themes/papirus-libreoffice-theme/metadata.xml
index 3c4f35ef3..fcc484376 100644
--- a/x11-themes/papirus-libreoffice-theme/metadata.xml
+++ b/x11-themes/papirus-libreoffice-theme/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>support@calculate.ru</email>
-		<name>Mir Calculate</name>
-		<description>Calculate Overlay</description>
-	</maintainer>
-	<upstream>
+    <maintainer type="project">
+        <email>support@calculate.ru</email>
+        <name>Mir Calculate</name>
+        <description>Calculate Overlay</description>
+    </maintainer>
+    <upstream>
         <remote-id type="github">PapirusDevelopmentTeam/papirus-libreoffice-theme</remote-id>
-	</upstream>
+    </upstream>
 </pkgmetadata>
\ No newline at end of file