diff --git a/Cargo.toml b/Cargo.toml
index ef41711..7964bd5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,7 +29,7 @@ futures-util = "0.3.29"
 futures = "0.3.29"
 rand = "0.8.5"
 reqwest = "0.11.24"
-constcat = "0.5.0"
+const_format = "0.2.32"
 
 [build]
 target = "x86_64-unknown-linux-gnu"
diff --git a/src/components/login.rs b/src/components/login.rs
index 4dbbd64..3ef39f9 100644
--- a/src/components/login.rs
+++ b/src/components/login.rs
@@ -1,4 +1,4 @@
-use constcat::concat as const_concat;
+use const_format::{concatcp, formatcp};
 use dioxus::prelude::*;
 use fermi::*;
 use rand::distributions::{Alphanumeric, DistString};
@@ -14,59 +14,31 @@ use super::wallpaper::Wallpaper;
 
 include!(concat!(env!("OUT_DIR"), "/style_vars.rs"));
 
+use style::{
+    COLOR_PRIMARY_100, COLOR_PRIMARY_110, COLOR_PRIMARY_120, COLOR_PRIMARY_140, COLOR_PRIMARY_150,
+    COLOR_PRIMARY_80, COLOR_PRIMARY_90, COLOR_SECONDARY_100, COLOR_SECONDARY_110,
+    COLOR_SECONDARY_120, COLOR_SECONDARY_140, COLOR_SECONDARY_150, COLOR_SECONDARY_80,
+    COLOR_SECONDARY_90, COLOR_TERNARY_100, COLOR_TERNARY_110, COLOR_TERNARY_120, COLOR_TERNARY_140,
+    COLOR_TERNARY_150, COLOR_TERNARY_80, COLOR_TERNARY_90,
+};
+
 turf::style_sheet!("src/components/login.scss");
 
-const SEP: &str = ",";
-
-const BACKGROUND_COLORS_STR: &str = const_concat!(
-    style::COLOR_PRIMARY_150,
-    SEP,
-    style::COLOR_PRIMARY_140,
-    SEP,
-    style::COLOR_SECONDARY_150,
-    SEP,
-    style::COLOR_SECONDARY_140,
-    SEP,
-    style::COLOR_TERNARY_150,
-    SEP,
-    style::COLOR_TERNARY_140,
+const BACKGROUND_COLORS_STR: &'static str = formatcp!(
+    "{COLOR_PRIMARY_150},{COLOR_PRIMARY_140},\
+{COLOR_SECONDARY_150},{COLOR_SECONDARY_140},\
+{COLOR_TERNARY_150},{COLOR_TERNARY_140}"
 );
 
-const SHAPE_1_COLORS_STR: &str = const_concat!(
-    style::COLOR_PRIMARY_120,
-    SEP,
-    style::COLOR_PRIMARY_110,
-    SEP,
-    style::COLOR_PRIMARY_100,
-    SEP,
-    style::COLOR_PRIMARY_90,
-    SEP,
-    style::COLOR_PRIMARY_80,
+const SHAPE_1_COLORS_STR: &'static str = formatcp!(
+    "{COLOR_PRIMARY_120},{COLOR_PRIMARY_110},{COLOR_PRIMARY_100},{COLOR_PRIMARY_90},{COLOR_PRIMARY_80}"
 );
 
-const SHAPE_2_COLORS_STR: &str = const_concat!(
-    style::COLOR_SECONDARY_120,
-    SEP,
-    style::COLOR_SECONDARY_110,
-    SEP,
-    style::COLOR_SECONDARY_100,
-    SEP,
-    style::COLOR_SECONDARY_90,
-    SEP,
-    style::COLOR_SECONDARY_80,
-);
+const SHAPE_2_COLORS_STR: &'static str = formatcp!(
+    "{COLOR_SECONDARY_120},{COLOR_SECONDARY_110},{COLOR_SECONDARY_100},{COLOR_SECONDARY_90},{COLOR_SECONDARY_80}");
 
-const SHAPE_3_COLORS_STR: &str = const_concat!(
-    style::COLOR_TERNARY_120,
-    SEP,
-    style::COLOR_TERNARY_110,
-    SEP,
-    style::COLOR_TERNARY_100,
-    SEP,
-    style::COLOR_TERNARY_90,
-    SEP,
-    style::COLOR_TERNARY_80,
-);
+const SHAPE_3_COLORS_STR: &'static str = formatcp!(
+    "{COLOR_TERNARY_120},{COLOR_TERNARY_110},{COLOR_TERNARY_100},{COLOR_TERNARY_90},{COLOR_TERNARY_80}");
 
 async fn generate_random_avatar(url: &String) -> Option<String> {
     let seed = Alphanumeric.sample_string(&mut rand::thread_rng(), 16);