diff --git a/fonts/.local/CaskaydiaCoveNerdFont b/fonts/.local/CaskaydiaCoveNerdFont
new file mode 120000
index 000000000..071cdf08e
--- /dev/null
+++ b/fonts/.local/CaskaydiaCoveNerdFont
@@ -0,0 +1 @@
+share/fonts/CaskaydiaCoveNerdFont
\ No newline at end of file
diff --git a/fonts/.local/Rubik b/fonts/.local/Rubik
new file mode 120000
index 000000000..3120e4a4f
--- /dev/null
+++ b/fonts/.local/Rubik
@@ -0,0 +1 @@
+share/fonts/Rubik
\ No newline at end of file
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFont-Bold.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFont-Bold.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFont-Bold.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFont-Bold.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFont-BoldItalic.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFont-BoldItalic.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFont-BoldItalic.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFont-BoldItalic.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFont-ExtraLight.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFont-ExtraLight.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFont-ExtraLight.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFont-ExtraLight.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFont-ExtraLightItalic.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFont-ExtraLightItalic.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFont-ExtraLightItalic.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFont-ExtraLightItalic.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFont-Italic.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFont-Italic.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFont-Italic.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFont-Italic.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFont-Light.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFont-Light.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFont-Light.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFont-Light.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFont-LightItalic.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFont-LightItalic.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFont-LightItalic.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFont-LightItalic.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFont-Regular.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFont-Regular.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFont-Regular.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFont-Regular.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFont-SemiBold.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFont-SemiBold.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFont-SemiBold.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFont-SemiBold.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFont-SemiBoldItalic.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFont-SemiBoldItalic.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFont-SemiBoldItalic.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFont-SemiBoldItalic.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFont-SemiLight.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFont-SemiLight.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFont-SemiLight.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFont-SemiLight.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFont-SemiLightItalic.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFont-SemiLightItalic.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFont-SemiLightItalic.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFont-SemiLightItalic.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFontMono-Bold.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontMono-Bold.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFontMono-Bold.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontMono-Bold.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFontMono-BoldItalic.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontMono-BoldItalic.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFontMono-BoldItalic.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontMono-BoldItalic.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFontMono-ExtraLight.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontMono-ExtraLight.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFontMono-ExtraLight.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontMono-ExtraLight.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFontMono-ExtraLightItalic.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontMono-ExtraLightItalic.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFontMono-ExtraLightItalic.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontMono-ExtraLightItalic.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFontMono-Italic.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontMono-Italic.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFontMono-Italic.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontMono-Italic.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFontMono-Light.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontMono-Light.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFontMono-Light.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontMono-Light.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFontMono-LightItalic.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontMono-LightItalic.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFontMono-LightItalic.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontMono-LightItalic.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFontMono-Regular.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontMono-Regular.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFontMono-Regular.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontMono-Regular.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFontMono-SemiBold.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontMono-SemiBold.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFontMono-SemiBold.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontMono-SemiBold.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFontMono-SemiBoldItalic.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontMono-SemiBoldItalic.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFontMono-SemiBoldItalic.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontMono-SemiBoldItalic.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFontMono-SemiLight.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontMono-SemiLight.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFontMono-SemiLight.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontMono-SemiLight.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFontMono-SemiLightItalic.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontMono-SemiLightItalic.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFontMono-SemiLightItalic.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontMono-SemiLightItalic.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFontPropo-Bold.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontPropo-Bold.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFontPropo-Bold.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontPropo-Bold.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFontPropo-BoldItalic.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontPropo-BoldItalic.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFontPropo-BoldItalic.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontPropo-BoldItalic.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFontPropo-ExtraLight.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontPropo-ExtraLight.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFontPropo-ExtraLight.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontPropo-ExtraLight.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFontPropo-ExtraLightItalic.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontPropo-ExtraLightItalic.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFontPropo-ExtraLightItalic.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontPropo-ExtraLightItalic.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFontPropo-Italic.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontPropo-Italic.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFontPropo-Italic.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontPropo-Italic.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFontPropo-Light.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontPropo-Light.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFontPropo-Light.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontPropo-Light.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFontPropo-LightItalic.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontPropo-LightItalic.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFontPropo-LightItalic.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontPropo-LightItalic.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFontPropo-Regular.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontPropo-Regular.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFontPropo-Regular.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontPropo-Regular.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFontPropo-SemiBold.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontPropo-SemiBold.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFontPropo-SemiBold.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontPropo-SemiBold.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFontPropo-SemiBoldItalic.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontPropo-SemiBoldItalic.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFontPropo-SemiBoldItalic.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontPropo-SemiBoldItalic.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFontPropo-SemiLight.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontPropo-SemiLight.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFontPropo-SemiLight.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontPropo-SemiLight.ttf
diff --git a/fonts/.local/share/fonts/CaskaydiaCoveNerdFontPropo-SemiLightItalic.ttf b/fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontPropo-SemiLightItalic.ttf
similarity index 100%
rename from fonts/.local/share/fonts/CaskaydiaCoveNerdFontPropo-SemiLightItalic.ttf
rename to fonts/.local/share/fonts/CaskaydiaCoveNerdFont/CaskaydiaCoveNerdFontPropo-SemiLightItalic.ttf
diff --git a/fonts/.local/share/fonts/Rubik-Black.ttf b/fonts/.local/share/fonts/Rubik-Black.ttf
deleted file mode 100644
index 055ad2205..000000000
Binary files a/fonts/.local/share/fonts/Rubik-Black.ttf and /dev/null differ
diff --git a/fonts/.local/share/fonts/Rubik-BlackItalic.ttf b/fonts/.local/share/fonts/Rubik-BlackItalic.ttf
deleted file mode 100644
index 308529cba..000000000
Binary files a/fonts/.local/share/fonts/Rubik-BlackItalic.ttf and /dev/null differ
diff --git a/fonts/.local/share/fonts/Rubik-Bold.ttf b/fonts/.local/share/fonts/Rubik-Bold.ttf
deleted file mode 100644
index 1a9693d97..000000000
Binary files a/fonts/.local/share/fonts/Rubik-Bold.ttf and /dev/null differ
diff --git a/fonts/.local/share/fonts/Rubik-BoldItalic.ttf b/fonts/.local/share/fonts/Rubik-BoldItalic.ttf
deleted file mode 100644
index abf760439..000000000
Binary files a/fonts/.local/share/fonts/Rubik-BoldItalic.ttf and /dev/null differ
diff --git a/fonts/.local/share/fonts/Rubik-ExtraBold.ttf b/fonts/.local/share/fonts/Rubik-ExtraBold.ttf
deleted file mode 100644
index 3b1e19036..000000000
Binary files a/fonts/.local/share/fonts/Rubik-ExtraBold.ttf and /dev/null differ
diff --git a/fonts/.local/share/fonts/Rubik-ExtraBoldItalic.ttf b/fonts/.local/share/fonts/Rubik-ExtraBoldItalic.ttf
deleted file mode 100644
index 59cd75865..000000000
Binary files a/fonts/.local/share/fonts/Rubik-ExtraBoldItalic.ttf and /dev/null differ
diff --git a/fonts/.local/share/fonts/Rubik-Italic.ttf b/fonts/.local/share/fonts/Rubik-Italic.ttf
deleted file mode 100644
index 1683a763e..000000000
Binary files a/fonts/.local/share/fonts/Rubik-Italic.ttf and /dev/null differ
diff --git a/fonts/.local/share/fonts/Rubik-Light.ttf b/fonts/.local/share/fonts/Rubik-Light.ttf
deleted file mode 100644
index 8a5a50ab6..000000000
Binary files a/fonts/.local/share/fonts/Rubik-Light.ttf and /dev/null differ
diff --git a/fonts/.local/share/fonts/Rubik-LightItalic.ttf b/fonts/.local/share/fonts/Rubik-LightItalic.ttf
deleted file mode 100644
index b028d93c8..000000000
Binary files a/fonts/.local/share/fonts/Rubik-LightItalic.ttf and /dev/null differ
diff --git a/fonts/.local/share/fonts/Rubik-Medium.ttf b/fonts/.local/share/fonts/Rubik-Medium.ttf
deleted file mode 100644
index f0bd59588..000000000
Binary files a/fonts/.local/share/fonts/Rubik-Medium.ttf and /dev/null differ
diff --git a/fonts/.local/share/fonts/Rubik-MediumItalic.ttf b/fonts/.local/share/fonts/Rubik-MediumItalic.ttf
deleted file mode 100644
index 1a7d7f9f6..000000000
Binary files a/fonts/.local/share/fonts/Rubik-MediumItalic.ttf and /dev/null differ
diff --git a/fonts/.local/share/fonts/Rubik-Regular.ttf b/fonts/.local/share/fonts/Rubik-Regular.ttf
deleted file mode 100644
index 8b7b632f9..000000000
Binary files a/fonts/.local/share/fonts/Rubik-Regular.ttf and /dev/null differ
diff --git a/fonts/.local/share/fonts/Rubik-SemiBold.ttf b/fonts/.local/share/fonts/Rubik-SemiBold.ttf
deleted file mode 100644
index 26f657de7..000000000
Binary files a/fonts/.local/share/fonts/Rubik-SemiBold.ttf and /dev/null differ
diff --git a/fonts/.local/share/fonts/Rubik-SemiBoldItalic.ttf b/fonts/.local/share/fonts/Rubik-SemiBoldItalic.ttf
deleted file mode 100644
index 88729833c..000000000
Binary files a/fonts/.local/share/fonts/Rubik-SemiBoldItalic.ttf and /dev/null differ
diff --git a/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-Black.ttf b/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-Black.ttf
new file mode 100644
index 000000000..1819aeb33
Binary files /dev/null and b/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-Black.ttf differ
diff --git a/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-BlackItalic.ttf b/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-BlackItalic.ttf
new file mode 100644
index 000000000..fae695b15
Binary files /dev/null and b/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-BlackItalic.ttf differ
diff --git a/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-Bold.ttf b/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-Bold.ttf
new file mode 100644
index 000000000..dfb87358d
Binary files /dev/null and b/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-Bold.ttf differ
diff --git a/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-BoldItalic.ttf b/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-BoldItalic.ttf
new file mode 100644
index 000000000..c39d850de
Binary files /dev/null and b/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-BoldItalic.ttf differ
diff --git a/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-ExtraBold.ttf b/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-ExtraBold.ttf
new file mode 100644
index 000000000..98f5c8c1f
Binary files /dev/null and b/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-ExtraBold.ttf differ
diff --git a/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-ExtraBoldItalic.ttf b/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-ExtraBoldItalic.ttf
new file mode 100644
index 000000000..169cd20f9
Binary files /dev/null and b/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-ExtraBoldItalic.ttf differ
diff --git a/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-Italic.ttf b/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-Italic.ttf
new file mode 100644
index 000000000..c6cb09e59
Binary files /dev/null and b/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-Italic.ttf differ
diff --git a/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-Light.ttf b/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-Light.ttf
new file mode 100644
index 000000000..35c8f7ab9
Binary files /dev/null and b/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-Light.ttf differ
diff --git a/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-LightItalic.ttf b/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-LightItalic.ttf
new file mode 100644
index 000000000..c2112e20b
Binary files /dev/null and b/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-LightItalic.ttf differ
diff --git a/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-Medium.ttf b/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-Medium.ttf
new file mode 100644
index 000000000..1064249ff
Binary files /dev/null and b/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-Medium.ttf differ
diff --git a/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-MediumItalic.ttf b/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-MediumItalic.ttf
new file mode 100644
index 000000000..9b04f64e5
Binary files /dev/null and b/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-MediumItalic.ttf differ
diff --git a/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-Regular.ttf b/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-Regular.ttf
new file mode 100644
index 000000000..7b56453b7
Binary files /dev/null and b/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-Regular.ttf differ
diff --git a/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-SemiBold.ttf b/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-SemiBold.ttf
new file mode 100644
index 000000000..d2bc680a2
Binary files /dev/null and b/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-SemiBold.ttf differ
diff --git a/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-SemiBoldItalic.ttf b/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-SemiBoldItalic.ttf
new file mode 100644
index 000000000..7843c5641
Binary files /dev/null and b/fonts/.local/share/fonts/RubikNerdFont/RubikNerdFont-SemiBoldItalic.ttf differ
diff --git a/gtk/.config/gtk-3.0/settings.ini b/gtk/.config/gtk-3.0/settings.ini
index abb2ecb09..7aeec11b3 100644
--- a/gtk/.config/gtk-3.0/settings.ini
+++ b/gtk/.config/gtk-3.0/settings.ini
@@ -1,6 +1,6 @@
 [Settings]
 gtk-theme-name = catppuccin-mocha-mauve-standard+default
-gtk-font-name = Rubik Medium, 11
+gtk-font-name = Rubik Nerda Font Medium, 11
 gtk-cursor-theme-name = Bibata-Modern-ClassicX
 gtk-icon-theme-name = Papirus-Dark
 gtk-application-prefer-dark-theme = false
diff --git a/gtk/.config/gtk-4.0/settings.ini b/gtk/.config/gtk-4.0/settings.ini
index abb2ecb09..ed5611cbf 100644
--- a/gtk/.config/gtk-4.0/settings.ini
+++ b/gtk/.config/gtk-4.0/settings.ini
@@ -1,6 +1,6 @@
 [Settings]
 gtk-theme-name = catppuccin-mocha-mauve-standard+default
-gtk-font-name = Rubik Medium, 11
+gtk-font-name = Rubik Nerd Font Medium, 11
 gtk-cursor-theme-name = Bibata-Modern-ClassicX
 gtk-icon-theme-name = Papirus-Dark
 gtk-application-prefer-dark-theme = false
diff --git a/qt/.config/qt5ct/qt5ct.conf b/qt/.config/qt5ct/qt5ct.conf
index a9489c90f..7ec0ca055 100644
--- a/qt/.config/qt5ct/qt5ct.conf
+++ b/qt/.config/qt5ct/qt5ct.conf
@@ -6,8 +6,8 @@ standard_dialogs=default
 style=Fusion
 
 [Fonts]
-fixed=@Variant(\0\0\0@\0\0\0\n\0R\0u\0\x62\0i\0k@&\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x39\x10)
-general=@Variant(\0\0\0@\0\0\0\n\0R\0u\0\x62\0i\0k@&\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x39\x10)
+fixed=@Variant(\0\0\0@\0\0\0\x1e\0R\0u\0\x62\0i\0k\0 \0N\0\x65\0r\0\x64\0 \0\x46\0o\0n\0t@&\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x39\x10)
+general=@Variant(\0\0\0@\0\0\0\x1e\0R\0u\0\x62\0i\0k\0 \0N\0\x65\0r\0\x64\0 \0\x46\0o\0n\0t@&\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x39\x10)
 
 [Interface]
 activate_item_on_single_click=1
@@ -28,4 +28,4 @@ wheel_scroll_lines=3
 geometry="@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0;\0\0\x2v\0\0\x2K\0\0\0\0\0\0\0;\0\0\x2v\0\0\x2K\0\0\0\0\x2\0\0\0\x5\0\0\0\0\0\0\0\0;\0\0\x2v\0\0\x2K)"
 
 [SettingsWindow]
-geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x2\x62\0\0\x2\xd5\0\0\0\0\0\0\0\0\0\0\x2\x7f\0\0\x3\x1\0\0\0\0\x2\0\0\0\x5\0\0\0\0\0\0\0\0\0\0\0\x2\x62\0\0\x2\xd5)
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x2\x62\0\0\x2\xcf\0\0\0\0\0\0\0\0\0\0\x2\x7f\0\0\x2\xfb\0\0\0\0\x2\0\0\0\x5\0\0\0\0\0\0\0\0\0\0\0\x2\x62\0\0\x2\xcf)
diff --git a/qt/.config/qt6ct/qt6ct.conf b/qt/.config/qt6ct/qt6ct.conf
index 9a8073821..b81a68d47 100644
--- a/qt/.config/qt6ct/qt6ct.conf
+++ b/qt/.config/qt6ct/qt6ct.conf
@@ -6,8 +6,8 @@ standard_dialogs=default
 style=Fusion
 
 [Fonts]
-fixed="Rubik,11,-1,5,500,0,0,0,0,0,0,0,0,0,0,1,Medium"
-general="Rubik,11,-1,5,500,0,0,0,0,0,0,0,0,0,0,1,Medium"
+fixed="Rubik Nerd Font,11,-1,5,500,0,0,0,0,0,0,0,0,0,0,1,Medium"
+general="Rubik Nerd Font,11,-1,5,500,0,0,0,0,0,0,0,0,0,0,1,Medium"
 
 [Interface]
 activate_item_on_single_click=1
@@ -28,7 +28,7 @@ wheel_scroll_lines=3
 geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x2v\0\0\x2\x10\0\0\0\0\0\0\0\0\0\0\x2v\0\0\x2\x10\0\0\0\0\x2\0\0\0\x5\0\0\0\0\0\0\0\0\0\0\0\x2v\0\0\x2\x10)
 
 [SettingsWindow]
-geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x2\x62\0\0\x2\xd5\0\0\0\0\0\0\0\0\0\0\x2\x7f\0\0\x3\x1\0\0\0\0\x2\0\0\0\x5\0\0\0\0\0\0\0\0\0\0\0\x2\x62\0\0\x2\xd5)
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x2\x62\0\0\x2\xcf\0\0\0\0\0\0\0\0\0\0\x2\x7f\0\0\x2\xfb\0\0\0\0\x2\0\0\0\x5\0\0\0\0\0\0\0\0\0\0\0\x2\x62\0\0\x2\xcf)
 
 [Troubleshooting]
 force_raster_widgets=1
diff --git a/rofi/.local/share/rofi/themes/catppuccin-mocha.rasi b/rofi/.local/share/rofi/themes/catppuccin-mocha.rasi
index d80d93111..35423cf5c 100644
--- a/rofi/.local/share/rofi/themes/catppuccin-mocha.rasi
+++ b/rofi/.local/share/rofi/themes/catppuccin-mocha.rasi
@@ -8,7 +8,7 @@
     fg-col2: #f38ba8;
     grey: #6c7086;
     width: 600;
-    font: "CaskaydiaCove Nerd Font 14";
+    font: "Rubik Nerd Font 14";
 }
 
 element-text, element-icon , mode-switcher {
diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css
index bbce08de7..13a72051c 100644
--- a/waybar/.config/waybar/style.css
+++ b/waybar/.config/waybar/style.css
@@ -1,7 +1,7 @@
 @import "mocha.css";
 
 * {
-    font-family: 'Rubik Medium', 'CaskaydiaCove Nerd Font', monospace;
+    font-family: 'Rubik Nerd Font Medium', monospace;
     font-size: 13px;
 }