diff --git a/lib/core/custom_theme.dart b/lib/core/custom_theme.dart
index 28ea385..25adf0f 100644
--- a/lib/core/custom_theme.dart
+++ b/lib/core/custom_theme.dart
@@ -19,7 +19,7 @@ class CustomTheme {
   static const Color boxColor = Color(0xFF101010);
 
   /// Default border color for boxes and containers
-  static const Color boxBorder = Color(0xFF272727);
+  static const Color boxBorderColor = Color(0xFF272727);
 
   /// Color for boxes and containers displayed on boxes
   static const Color onBoxColor = Color(0xFF181818);
@@ -54,7 +54,7 @@ class CustomTheme {
   // ==================== Decorations ====================
   static BoxDecoration standardBoxDecoration = BoxDecoration(
     color: boxColor,
-    border: Border.all(color: boxBorder),
+    border: Border.all(color: boxBorderColor),
     borderRadius: standardBorderRadiusAll,
   );
 
diff --git a/lib/presentation/views/main_menu/custom_navigation_bar.dart b/lib/presentation/views/main_menu/custom_navigation_bar.dart
index 7eb9b66..6d18091 100644
--- a/lib/presentation/views/main_menu/custom_navigation_bar.dart
+++ b/lib/presentation/views/main_menu/custom_navigation_bar.dart
@@ -79,7 +79,7 @@ class _CustomNavigationBarState extends State<CustomNavigationBar>
           color: CustomTheme.navBarBackgroundColor,
           border: Border.all(
             strokeAlign: BorderSide.strokeAlignOutside,
-            color: CustomTheme.boxBorder,
+            color: CustomTheme.boxBorderColor,
             width: 2,
           ),
           borderRadius: const BorderRadius.only(
diff --git a/lib/presentation/views/main_menu/match_view/match_result_view.dart b/lib/presentation/views/main_menu/match_view/match_result_view.dart
index 75015f0..214c500 100644
--- a/lib/presentation/views/main_menu/match_view/match_result_view.dart
+++ b/lib/presentation/views/main_menu/match_view/match_result_view.dart
@@ -74,7 +74,7 @@ class _MatchResultViewState extends State<MatchResultView> {
                 ),
                 decoration: BoxDecoration(
                   color: CustomTheme.boxColor,
-                  border: Border.all(color: CustomTheme.boxBorder),
+                  border: Border.all(color: CustomTheme.boxBorderColor),
                   borderRadius: BorderRadius.circular(12),
                 ),
                 child: Column(
diff --git a/lib/presentation/widgets/custom_alert_dialog.dart b/lib/presentation/widgets/custom_alert_dialog.dart
index 84843b7..bf98f2c 100644
--- a/lib/presentation/widgets/custom_alert_dialog.dart
+++ b/lib/presentation/widgets/custom_alert_dialog.dart
@@ -32,7 +32,7 @@ class CustomAlertDialog extends StatelessWidget {
       actionsAlignment: MainAxisAlignment.spaceAround,
       shape: RoundedRectangleBorder(
         borderRadius: CustomTheme.standardBorderRadiusAll,
-        side: const BorderSide(color: CustomTheme.boxBorder),
+        side: const BorderSide(color: CustomTheme.boxBorderColor),
       ),
     );
   }
diff --git a/lib/presentation/widgets/text_input/custom_search_bar.dart b/lib/presentation/widgets/text_input/custom_search_bar.dart
index aeb71f2..313fc1a 100644
--- a/lib/presentation/widgets/text_input/custom_search_bar.dart
+++ b/lib/presentation/widgets/text_input/custom_search_bar.dart
@@ -88,7 +88,7 @@ class CustomSearchBar extends StatelessWidget {
       ],
       backgroundColor: WidgetStateProperty.all(CustomTheme.boxColor),
       side: WidgetStateProperty.all(
-        const BorderSide(color: CustomTheme.boxBorder),
+        const BorderSide(color: CustomTheme.boxBorderColor),
       ),
       shape: WidgetStateProperty.all(
         RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
diff --git a/lib/presentation/widgets/text_input/text_input_field.dart b/lib/presentation/widgets/text_input/text_input_field.dart
index 16f5072..541ae6f 100644
--- a/lib/presentation/widgets/text_input/text_input_field.dart
+++ b/lib/presentation/widgets/text_input/text_input_field.dart
@@ -44,11 +44,11 @@ class TextInputField extends StatelessWidget {
         counterText: '',
         enabledBorder: const OutlineInputBorder(
           borderRadius: BorderRadius.all(Radius.circular(12)),
-          borderSide: BorderSide(color: CustomTheme.boxBorder),
+          borderSide: BorderSide(color: CustomTheme.boxBorderColor),
         ),
         focusedBorder: const OutlineInputBorder(
           borderRadius: BorderRadius.all(Radius.circular(12)),
-          borderSide: BorderSide(color: CustomTheme.boxBorder),
+          borderSide: BorderSide(color: CustomTheme.boxBorderColor),
         ),
         floatingLabelBehavior: FloatingLabelBehavior.never,
       ),
diff --git a/lib/presentation/widgets/tiles/custom_radio_list_tile.dart b/lib/presentation/widgets/tiles/custom_radio_list_tile.dart
index 2b8e855..53d0a03 100644
--- a/lib/presentation/widgets/tiles/custom_radio_list_tile.dart
+++ b/lib/presentation/widgets/tiles/custom_radio_list_tile.dart
@@ -31,7 +31,7 @@ class CustomRadioListTile<T> extends StatelessWidget {
         padding: const EdgeInsets.symmetric(horizontal: 2),
         decoration: BoxDecoration(
           color: CustomTheme.boxColor,
-          border: Border.all(color: CustomTheme.boxBorder),
+          border: Border.all(color: CustomTheme.boxBorderColor),
           borderRadius: CustomTheme.standardBorderRadiusAll,
         ),
         child: Row(