diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/HomeSelected.imageset/Contents.json b/HackIllinois/Assets.xcassets/TabBarIcons/HomeSelected.imageset/Contents.json
index cf6c2c4a..beb6fc9c 100644
--- a/HackIllinois/Assets.xcassets/TabBarIcons/HomeSelected.imageset/Contents.json
+++ b/HackIllinois/Assets.xcassets/TabBarIcons/HomeSelected.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "HomeSelected@1x.png",
+      "filename" : "Group 977.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "HomeSelected@2x.png",
+      "filename" : "Group 977 (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "HomeSelected@3x.png",
+      "filename" : "Group 977 (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/HomeSelected.imageset/Group 977 (1).png b/HackIllinois/Assets.xcassets/TabBarIcons/HomeSelected.imageset/Group 977 (1).png
new file mode 100644
index 00000000..087d0c51
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/HomeSelected.imageset/Group 977 (1).png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/HomeSelected.imageset/Group 977 (2).png b/HackIllinois/Assets.xcassets/TabBarIcons/HomeSelected.imageset/Group 977 (2).png
new file mode 100644
index 00000000..89db49b9
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/HomeSelected.imageset/Group 977 (2).png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/HomeSelected.imageset/Group 977.png b/HackIllinois/Assets.xcassets/TabBarIcons/HomeSelected.imageset/Group 977.png
new file mode 100644
index 00000000..3056d4fb
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/HomeSelected.imageset/Group 977.png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/HomeSelected.imageset/HomeSelected@1x.png b/HackIllinois/Assets.xcassets/TabBarIcons/HomeSelected.imageset/HomeSelected@1x.png
deleted file mode 100644
index 5f5bbaef..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/HomeSelected.imageset/HomeSelected@1x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/HomeSelected.imageset/HomeSelected@2x.png b/HackIllinois/Assets.xcassets/TabBarIcons/HomeSelected.imageset/HomeSelected@2x.png
deleted file mode 100644
index 18722cc0..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/HomeSelected.imageset/HomeSelected@2x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/HomeSelected.imageset/HomeSelected@3x.png b/HackIllinois/Assets.xcassets/TabBarIcons/HomeSelected.imageset/HomeSelected@3x.png
deleted file mode 100644
index f7df6137..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/HomeSelected.imageset/HomeSelected@3x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/LeaderboardSelected.imageset/Contents.json b/HackIllinois/Assets.xcassets/TabBarIcons/LeaderboardSelected.imageset/Contents.json
index a484c33e..6b729b00 100644
--- a/HackIllinois/Assets.xcassets/TabBarIcons/LeaderboardSelected.imageset/Contents.json
+++ b/HackIllinois/Assets.xcassets/TabBarIcons/LeaderboardSelected.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "LeaderboardSelected@1x.png",
+      "filename" : "Group 978.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "LeaderboardSelected@2x.png",
+      "filename" : "Group 978 (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "LeaderboardSelected@3x.png",
+      "filename" : "Group 978 (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/LeaderboardSelected.imageset/Group 978 (1).png b/HackIllinois/Assets.xcassets/TabBarIcons/LeaderboardSelected.imageset/Group 978 (1).png
new file mode 100644
index 00000000..977bfac3
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/LeaderboardSelected.imageset/Group 978 (1).png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/LeaderboardSelected.imageset/Group 978 (2).png b/HackIllinois/Assets.xcassets/TabBarIcons/LeaderboardSelected.imageset/Group 978 (2).png
new file mode 100644
index 00000000..91e28aa2
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/LeaderboardSelected.imageset/Group 978 (2).png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/LeaderboardSelected.imageset/Group 978.png b/HackIllinois/Assets.xcassets/TabBarIcons/LeaderboardSelected.imageset/Group 978.png
new file mode 100644
index 00000000..fbf5bda0
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/LeaderboardSelected.imageset/Group 978.png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/LeaderboardSelected.imageset/LeaderboardSelected@1x.png b/HackIllinois/Assets.xcassets/TabBarIcons/LeaderboardSelected.imageset/LeaderboardSelected@1x.png
deleted file mode 100644
index b86446c5..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/LeaderboardSelected.imageset/LeaderboardSelected@1x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/LeaderboardSelected.imageset/LeaderboardSelected@2x.png b/HackIllinois/Assets.xcassets/TabBarIcons/LeaderboardSelected.imageset/LeaderboardSelected@2x.png
deleted file mode 100644
index 5ba60501..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/LeaderboardSelected.imageset/LeaderboardSelected@2x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/LeaderboardSelected.imageset/LeaderboardSelected@3x.png b/HackIllinois/Assets.xcassets/TabBarIcons/LeaderboardSelected.imageset/LeaderboardSelected@3x.png
deleted file mode 100644
index 0238b49e..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/LeaderboardSelected.imageset/LeaderboardSelected@3x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/ProfileSelected.imageset/Contents.json b/HackIllinois/Assets.xcassets/TabBarIcons/ProfileSelected.imageset/Contents.json
index bedca0c4..4e29aa9b 100644
--- a/HackIllinois/Assets.xcassets/TabBarIcons/ProfileSelected.imageset/Contents.json
+++ b/HackIllinois/Assets.xcassets/TabBarIcons/ProfileSelected.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "ProfileSelected@1x.png",
+      "filename" : "Group 977 (3).png",
       "idiom" : "universal",
       "scale" : "1x"
     },
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/ProfileSelected.imageset/Group 977 (3).png b/HackIllinois/Assets.xcassets/TabBarIcons/ProfileSelected.imageset/Group 977 (3).png
new file mode 100644
index 00000000..180399ea
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/ProfileSelected.imageset/Group 977 (3).png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/ProfileSelected.imageset/ProfileSelected@1x.png b/HackIllinois/Assets.xcassets/TabBarIcons/ProfileSelected.imageset/ProfileSelected@1x.png
deleted file mode 100644
index 4d0ce780..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/ProfileSelected.imageset/ProfileSelected@1x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/Camera (1).png b/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/Camera (1).png
new file mode 100644
index 00000000..c445a9e7
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/Camera (1).png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/Camera (2).png b/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/Camera (2).png
new file mode 100644
index 00000000..a1bbd90a
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/Camera (2).png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/Camera.png b/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/Camera.png
new file mode 100644
index 00000000..1250a9a8
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/Camera.png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/Contents.json b/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/Contents.json
index b8de64aa..4fa46dc3 100644
--- a/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/Contents.json
+++ b/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "qr-code.png",
+      "filename" : "Camera.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "qr-code2x.png",
+      "filename" : "Camera (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "qr-code3x.png",
+      "filename" : "Camera (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code.png b/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code.png
deleted file mode 100644
index 41eb86d2..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code2x.png b/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code2x.png
deleted file mode 100644
index 6c825d07..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code2x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code3x.png b/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code3x.png
deleted file mode 100644
index fd0aa8cd..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/QRCode.imageset/qr-code3x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/Camera (1).png b/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/Camera (1).png
new file mode 100644
index 00000000..c445a9e7
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/Camera (1).png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/Camera (2).png b/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/Camera (2).png
new file mode 100644
index 00000000..a1bbd90a
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/Camera (2).png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/Camera.png b/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/Camera.png
new file mode 100644
index 00000000..1250a9a8
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/Camera.png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/Contents.json b/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/Contents.json
index 5a90aa61..fc02d685 100644
--- a/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/Contents.json
+++ b/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "qr-code.png",
+      "filename" : "Camera.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "qr-code2x.png",
+      "filename" : "Camera (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "qr-code3x.png",
+      "filename" : "Camera (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code.png b/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code.png
deleted file mode 100644
index 41eb86d2..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code2x.png b/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code2x.png
deleted file mode 100644
index 6c825d07..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code2x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code3x.png b/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code3x.png
deleted file mode 100644
index fd0aa8cd..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/QRScannerPopupTabIcon.imageset/qr-code3x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/ScheduleSelected.imageset/Contents.json b/HackIllinois/Assets.xcassets/TabBarIcons/ScheduleSelected.imageset/Contents.json
index 01218c56..33e6f3d4 100644
--- a/HackIllinois/Assets.xcassets/TabBarIcons/ScheduleSelected.imageset/Contents.json
+++ b/HackIllinois/Assets.xcassets/TabBarIcons/ScheduleSelected.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "ScheduleSelected@1x.png",
+      "filename" : "Group 979.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "ScheduleSelected@2x.png",
+      "filename" : "Group 979 (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "ScheduleSelected@3x.png",
+      "filename" : "Group 979 (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/ScheduleSelected.imageset/Group 979 (1).png b/HackIllinois/Assets.xcassets/TabBarIcons/ScheduleSelected.imageset/Group 979 (1).png
new file mode 100644
index 00000000..2cead025
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/ScheduleSelected.imageset/Group 979 (1).png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/ScheduleSelected.imageset/Group 979 (2).png b/HackIllinois/Assets.xcassets/TabBarIcons/ScheduleSelected.imageset/Group 979 (2).png
new file mode 100644
index 00000000..cca4939f
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/ScheduleSelected.imageset/Group 979 (2).png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/ScheduleSelected.imageset/Group 979.png b/HackIllinois/Assets.xcassets/TabBarIcons/ScheduleSelected.imageset/Group 979.png
new file mode 100644
index 00000000..287d070b
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/ScheduleSelected.imageset/Group 979.png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/ScheduleSelected.imageset/Group 979.png~HEAD b/HackIllinois/Assets.xcassets/TabBarIcons/ScheduleSelected.imageset/Group 979.png~HEAD
new file mode 100644
index 00000000..287d070b
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/ScheduleSelected.imageset/Group 979.png~HEAD differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/ScheduleSelected.imageset/ScheduleSelected@1x.png b/HackIllinois/Assets.xcassets/TabBarIcons/ScheduleSelected.imageset/ScheduleSelected@1x.png
deleted file mode 100644
index 5c589ca5..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/ScheduleSelected.imageset/ScheduleSelected@1x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/ScheduleSelected.imageset/ScheduleSelected@2x.png b/HackIllinois/Assets.xcassets/TabBarIcons/ScheduleSelected.imageset/ScheduleSelected@2x.png
deleted file mode 100644
index 61734561..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/ScheduleSelected.imageset/ScheduleSelected@2x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/ScheduleSelected.imageset/ScheduleSelected@3x.png b/HackIllinois/Assets.xcassets/TabBarIcons/ScheduleSelected.imageset/ScheduleSelected@3x.png
deleted file mode 100644
index 5f85cd30..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/ScheduleSelected.imageset/ScheduleSelected@3x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/home.imageset/Battle (1).png b/HackIllinois/Assets.xcassets/TabBarIcons/home.imageset/Battle (1).png
new file mode 100644
index 00000000..df85d7a7
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/home.imageset/Battle (1).png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/home.imageset/Battle (2).png b/HackIllinois/Assets.xcassets/TabBarIcons/home.imageset/Battle (2).png
new file mode 100644
index 00000000..8c5d4e09
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/home.imageset/Battle (2).png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/home.imageset/Battle.png b/HackIllinois/Assets.xcassets/TabBarIcons/home.imageset/Battle.png
new file mode 100644
index 00000000..493dea93
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/home.imageset/Battle.png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/home.imageset/Contents.json b/HackIllinois/Assets.xcassets/TabBarIcons/home.imageset/Contents.json
index 76aff5ef..51d9c875 100644
--- a/HackIllinois/Assets.xcassets/TabBarIcons/home.imageset/Contents.json
+++ b/HackIllinois/Assets.xcassets/TabBarIcons/home.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "home@1x.png",
+      "filename" : "Battle.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "home@2x.png",
+      "filename" : "Battle (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "home@3x.png",
+      "filename" : "Battle (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/home.imageset/home@1x.png b/HackIllinois/Assets.xcassets/TabBarIcons/home.imageset/home@1x.png
deleted file mode 100644
index f0ef27e0..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/home.imageset/home@1x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/home.imageset/home@2x.png b/HackIllinois/Assets.xcassets/TabBarIcons/home.imageset/home@2x.png
deleted file mode 100644
index 73573b17..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/home.imageset/home@2x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/home.imageset/home@3x.png b/HackIllinois/Assets.xcassets/TabBarIcons/home.imageset/home@3x.png
deleted file mode 100644
index f3a6cc8c..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/home.imageset/home@3x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/leaderboard.imageset/Contents.json b/HackIllinois/Assets.xcassets/TabBarIcons/leaderboard.imageset/Contents.json
index bfb69621..679afaae 100644
--- a/HackIllinois/Assets.xcassets/TabBarIcons/leaderboard.imageset/Contents.json
+++ b/HackIllinois/Assets.xcassets/TabBarIcons/leaderboard.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "leaderboard@1x.png",
+      "filename" : "image.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "leaderboard@2x.png",
+      "filename" : "image (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "leaderboard@3x.png",
+      "filename" : "image (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/leaderboard.imageset/image (1).png b/HackIllinois/Assets.xcassets/TabBarIcons/leaderboard.imageset/image (1).png
new file mode 100644
index 00000000..21e1f0de
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/leaderboard.imageset/image (1).png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/leaderboard.imageset/image (2).png b/HackIllinois/Assets.xcassets/TabBarIcons/leaderboard.imageset/image (2).png
new file mode 100644
index 00000000..545996ff
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/leaderboard.imageset/image (2).png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/leaderboard.imageset/image.png b/HackIllinois/Assets.xcassets/TabBarIcons/leaderboard.imageset/image.png
new file mode 100644
index 00000000..e1137ea7
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/leaderboard.imageset/image.png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/leaderboard.imageset/image.png~HEAD b/HackIllinois/Assets.xcassets/TabBarIcons/leaderboard.imageset/image.png~HEAD
new file mode 100644
index 00000000..e1137ea7
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/leaderboard.imageset/image.png~HEAD differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/leaderboard.imageset/image.png~nav-bar b/HackIllinois/Assets.xcassets/TabBarIcons/leaderboard.imageset/image.png~nav-bar
new file mode 100644
index 00000000..e1137ea7
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/leaderboard.imageset/image.png~nav-bar differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/leaderboard.imageset/leaderboard@1x.png b/HackIllinois/Assets.xcassets/TabBarIcons/leaderboard.imageset/leaderboard@1x.png
deleted file mode 100644
index 8713ef35..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/leaderboard.imageset/leaderboard@1x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/leaderboard.imageset/leaderboard@2x.png b/HackIllinois/Assets.xcassets/TabBarIcons/leaderboard.imageset/leaderboard@2x.png
deleted file mode 100644
index 8856a4e6..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/leaderboard.imageset/leaderboard@2x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/leaderboard.imageset/leaderboard@3x.png b/HackIllinois/Assets.xcassets/TabBarIcons/leaderboard.imageset/leaderboard@3x.png
deleted file mode 100644
index 0a0ffc61..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/leaderboard.imageset/leaderboard@3x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/profile.imageset/Contents.json b/HackIllinois/Assets.xcassets/TabBarIcons/profile.imageset/Contents.json
index 652fa727..f75c13c5 100644
--- a/HackIllinois/Assets.xcassets/TabBarIcons/profile.imageset/Contents.json
+++ b/HackIllinois/Assets.xcassets/TabBarIcons/profile.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "profile@1x.png",
+      "filename" : "image (3).png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "profile@2x.png",
+      "filename" : "image (4).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "profile@3x.png",
+      "filename" : "image (5).png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/profile.imageset/image (3).png b/HackIllinois/Assets.xcassets/TabBarIcons/profile.imageset/image (3).png
new file mode 100644
index 00000000..9a938a7b
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/profile.imageset/image (3).png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/profile.imageset/image (4).png b/HackIllinois/Assets.xcassets/TabBarIcons/profile.imageset/image (4).png
new file mode 100644
index 00000000..ee3e9104
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/profile.imageset/image (4).png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/profile.imageset/image (5).png b/HackIllinois/Assets.xcassets/TabBarIcons/profile.imageset/image (5).png
new file mode 100644
index 00000000..4558a735
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/profile.imageset/image (5).png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/profile.imageset/profile@1x.png b/HackIllinois/Assets.xcassets/TabBarIcons/profile.imageset/profile@1x.png
deleted file mode 100644
index 788d816b..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/profile.imageset/profile@1x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/profile.imageset/profile@2x.png b/HackIllinois/Assets.xcassets/TabBarIcons/profile.imageset/profile@2x.png
deleted file mode 100644
index 2e2207ca..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/profile.imageset/profile@2x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/profile.imageset/profile@3x.png b/HackIllinois/Assets.xcassets/TabBarIcons/profile.imageset/profile@3x.png
deleted file mode 100644
index 14c78628..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/profile.imageset/profile@3x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/Contents.json b/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/Contents.json
index 3f6e23af..87359f3a 100644
--- a/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/Contents.json
+++ b/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "schedule@1x.png",
+      "filename" : "Group 974.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "schedule@2x.png",
+      "filename" : "Group 974 (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "schedule@3x.png",
+      "filename" : "Group 974 (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/Group 974 (1).png b/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/Group 974 (1).png
new file mode 100644
index 00000000..8572b6dd
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/Group 974 (1).png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/Group 974 (2).png b/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/Group 974 (2).png
new file mode 100644
index 00000000..664de71d
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/Group 974 (2).png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/Group 974.png b/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/Group 974.png
new file mode 100644
index 00000000..a94c518c
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/Group 974.png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/Tear-Off Calendar (1).png b/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/Tear-Off Calendar (1).png
new file mode 100644
index 00000000..bc9b0c25
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/Tear-Off Calendar (1).png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/Tear-Off Calendar (2).png b/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/Tear-Off Calendar (2).png
new file mode 100644
index 00000000..b0d6c0ff
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/Tear-Off Calendar (2).png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/Tear-Off Calendar.png b/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/Tear-Off Calendar.png
new file mode 100644
index 00000000..820c18d7
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/Tear-Off Calendar.png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/schedule@1x.png b/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/schedule@1x.png
deleted file mode 100644
index 5692d11f..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/schedule@1x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/schedule@2x.png b/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/schedule@2x.png
deleted file mode 100644
index a913b4d7..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/schedule@2x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/schedule@3x.png b/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/schedule@3x.png
deleted file mode 100644
index 1a091ee8..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/schedule.imageset/schedule@3x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/shop.imageset/Contents.json b/HackIllinois/Assets.xcassets/TabBarIcons/shop.imageset/Contents.json
index 3eefb823..679afaae 100644
--- a/HackIllinois/Assets.xcassets/TabBarIcons/shop.imageset/Contents.json
+++ b/HackIllinois/Assets.xcassets/TabBarIcons/shop.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "PointShopIcon1x.png",
+      "filename" : "image.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "PointShopIcon2x.png",
+      "filename" : "image (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "PointShopIcon3x.png",
+      "filename" : "image (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/shop.imageset/PointShopIcon1x.png b/HackIllinois/Assets.xcassets/TabBarIcons/shop.imageset/PointShopIcon1x.png
deleted file mode 100644
index b83fc2f6..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/shop.imageset/PointShopIcon1x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/shop.imageset/PointShopIcon2x.png b/HackIllinois/Assets.xcassets/TabBarIcons/shop.imageset/PointShopIcon2x.png
deleted file mode 100644
index 7797eb47..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/shop.imageset/PointShopIcon2x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/shop.imageset/PointShopIcon3x.png b/HackIllinois/Assets.xcassets/TabBarIcons/shop.imageset/PointShopIcon3x.png
deleted file mode 100644
index 2b6b6b40..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/shop.imageset/PointShopIcon3x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/shop.imageset/image (1).png b/HackIllinois/Assets.xcassets/TabBarIcons/shop.imageset/image (1).png
new file mode 100644
index 00000000..21e1f0de
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/shop.imageset/image (1).png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/shop.imageset/image (2).png b/HackIllinois/Assets.xcassets/TabBarIcons/shop.imageset/image (2).png
new file mode 100644
index 00000000..545996ff
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/shop.imageset/image (2).png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/shop.imageset/image.png b/HackIllinois/Assets.xcassets/TabBarIcons/shop.imageset/image.png
new file mode 100644
index 00000000..e1137ea7
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/shop.imageset/image.png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/shopSelected.imageset/Contents.json b/HackIllinois/Assets.xcassets/TabBarIcons/shopSelected.imageset/Contents.json
index de76c7b6..6b729b00 100644
--- a/HackIllinois/Assets.xcassets/TabBarIcons/shopSelected.imageset/Contents.json
+++ b/HackIllinois/Assets.xcassets/TabBarIcons/shopSelected.imageset/Contents.json
@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "shop1x.png",
+      "filename" : "Group 978.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "shop2x.png",
+      "filename" : "Group 978 (1).png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "shop3x.png",
+      "filename" : "Group 978 (2).png",
       "idiom" : "universal",
       "scale" : "3x"
     }
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/shopSelected.imageset/Group 978 (1).png b/HackIllinois/Assets.xcassets/TabBarIcons/shopSelected.imageset/Group 978 (1).png
new file mode 100644
index 00000000..977bfac3
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/shopSelected.imageset/Group 978 (1).png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/shopSelected.imageset/Group 978 (2).png b/HackIllinois/Assets.xcassets/TabBarIcons/shopSelected.imageset/Group 978 (2).png
new file mode 100644
index 00000000..91e28aa2
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/shopSelected.imageset/Group 978 (2).png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/shopSelected.imageset/Group 978.png b/HackIllinois/Assets.xcassets/TabBarIcons/shopSelected.imageset/Group 978.png
new file mode 100644
index 00000000..fbf5bda0
Binary files /dev/null and b/HackIllinois/Assets.xcassets/TabBarIcons/shopSelected.imageset/Group 978.png differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/shopSelected.imageset/shop1x.png b/HackIllinois/Assets.xcassets/TabBarIcons/shopSelected.imageset/shop1x.png
deleted file mode 100644
index 83a912f4..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/shopSelected.imageset/shop1x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/shopSelected.imageset/shop2x.png b/HackIllinois/Assets.xcassets/TabBarIcons/shopSelected.imageset/shop2x.png
deleted file mode 100644
index ccbc0542..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/shopSelected.imageset/shop2x.png and /dev/null differ
diff --git a/HackIllinois/Assets.xcassets/TabBarIcons/shopSelected.imageset/shop3x.png b/HackIllinois/Assets.xcassets/TabBarIcons/shopSelected.imageset/shop3x.png
deleted file mode 100644
index b1466d43..00000000
Binary files a/HackIllinois/Assets.xcassets/TabBarIcons/shopSelected.imageset/shop3x.png and /dev/null differ
diff --git a/HackIllinois/FlowControllers/HITabBarController.swift b/HackIllinois/FlowControllers/HITabBarController.swift
index 9ee46af9..308acf21 100644
--- a/HackIllinois/FlowControllers/HITabBarController.swift
+++ b/HackIllinois/FlowControllers/HITabBarController.swift
@@ -1,3 +1,4 @@
+
 //
 //  HITabBarController.swift
 //  HackIllinois
@@ -71,8 +72,8 @@ class HITabBarController: UITabBarController {
         let qrScannerPopupButton = UIButton()
         view.addSubview(qrScannerPopupButton)
         qrScannerPopupButton.translatesAutoresizingMaskIntoConstraints = false
-        qrScannerPopupButton.frame.size = CGSize(width: 54, height: 54)
-        qrScannerPopupButton.layer.cornerRadius = 28
+        qrScannerPopupButton.frame.size = CGSize(width: 75, height: 75)
+        qrScannerPopupButton.layer.cornerRadius = 38
         qrScannerPopupButton.center = CGPoint(x: view.center.x, y: 0)
         if self.selectedViewController is HIQRScannerSelection {
             qrScannerPopupButton.backgroundColor = (\HIAppearance.greenCodePopupTab).value
@@ -83,16 +84,16 @@ class HITabBarController: UITabBarController {
         qrScannerPopupButton.imageView?.contentMode = .scaleAspectFill
 
         // Button Shadow
-        qrScannerPopupButton.layer.shadowColor = UIColor(red: 0, green: 0, blue: 0, alpha: 0.25).cgColor
+        qrScannerPopupButton.layer.shadowColor = UIColor(red: 0, green: 0, blue: 0, alpha: 0.45).cgColor
         qrScannerPopupButton.layer.shadowOpacity = 1
-        qrScannerPopupButton.layer.shadowRadius = 15
+        qrScannerPopupButton.layer.shadowRadius = 20
         qrScannerPopupButton.layer.masksToBounds = false
         qrScannerPopupButton.layer.shadowOffset = CGSize(width: 0, height: 0)
 
         //QR Scanner PopupButton Constraints
         qrScannerPopupButton.centerXAnchor.constraint(equalTo: view.centerXAnchor).isActive = true
         qrScannerPopupButton.centerYAnchor.constraint(equalTo: tabBar.topAnchor, constant: 0).isActive = true
-        qrScannerPopupButton.constrain(width: 54, height: 54)
+        qrScannerPopupButton.constrain(width: 75, height: 75)
 
         //QR Scanner PopupAction
         qrScannerPopupButton.addTarget(self, action: #selector(qrScannerPopupButtonPressed(_:)), for: .touchUpInside)
@@ -123,7 +124,7 @@ class HITabBarController: UITabBarController {
     }
 
     func createPath() -> CGPath {
-        let radius: CGFloat = 32.0
+        let radius: CGFloat = 43.0
         let smallRadius: CGFloat = 8.0
         let path = UIBezierPath()
 
@@ -190,3 +191,6 @@ class HITabBarController: UITabBarController {
         }
     }
 }
+
+
+
diff --git a/HackIllinois/UI/HIAppearance.swift b/HackIllinois/UI/HIAppearance.swift
index b2d4d937..6d5b5351 100644
--- a/HackIllinois/UI/HIAppearance.swift
+++ b/HackIllinois/UI/HIAppearance.swift
@@ -1,3 +1,5 @@
+
+
 //
 //  HIAppearance.swift
 //  HackIllinois
@@ -97,8 +99,11 @@ struct HIAppearance: Equatable {
     private static let darkBlue = #colorLiteral(red: 0.05098039216, green: 0.2196078431, blue: 0.4862745098, alpha: 1); private static let magenta = #colorLiteral(red: 0.9960784314, green: 0.4392156863, blue: 0.5960784314, alpha: 1)
     private static let darkBlueGreen = #colorLiteral(red: 0.03137254902, green: 0.5450980392, blue: 0.7568627451, alpha: 1); private static let vegetarian = #colorLiteral(red: 0.2156862745, green: 0.8705882353, blue: 0.8039215686, alpha: 1)
     private static let vegan = #colorLiteral(red: 0.9882352941, green: 0.862745098, blue: 0.5607843137, alpha: 1); private static let glutenfree = #colorLiteral(red: 0.9764705882, green: 0.5843137255, blue: 0.3411764706, alpha: 1)
-    private static let lactoseintolerant = #colorLiteral(red: 1, green: 1, blue: 1, alpha: 1); private static let other = #colorLiteral(red: 0.9960784314, green: 0.6392156863, blue: 0.6666666667, alpha: 1); private static let none = #colorLiteral(red: 0.1137254902, green: 0.1490196078, blue: 0.2666666667, alpha: 1)
-    private static let profileBaseText = #colorLiteral(red: 0.1137254902, green: 0.1490196078, blue: 0.2666666667, alpha: 1); private static let yellowGreen = #colorLiteral(red: 0.7882352941, green: 0.8117647059, blue: 0.462745098, alpha: 1)
+    private static let lactoseintolerant = #colorLiteral(red: 1, green: 1, blue: 1, alpha: 1)
+    private static let other = #colorLiteral(red: 0.9960784314, green: 0.6392156863, blue: 0.6666666667, alpha: 1)
+    private static let none = #colorLiteral(red: 0.1137254902, green: 0.1490196078, blue: 0.2666666667, alpha: 1)
+    private static let profileBaseText = #colorLiteral(red: 0.1137254902, green: 0.1490196078, blue: 0.2666666667, alpha: 1)
+    private static let yellowGreen = #colorLiteral(red: 0.7882352941, green: 0.8117647059, blue: 0.462745098, alpha: 1)
     private static let green = #colorLiteral(red: 0.4705882353, green: 0.6745098039, blue: 0.2588235294, alpha: 1)
     // Hack 2024 color palette
     private static let icyBlue = #colorLiteral(red: 0.8235294118, green: 0.968627451, blue: 1, alpha: 1); private static let bLightYellow = #colorLiteral(red: 1, green: 0.9803921569, blue: 0.8, alpha: 1)
@@ -108,25 +113,24 @@ struct HIAppearance: Equatable {
     private static let lightBlue = #colorLiteral(red: 0.7176470588, green: 0.8392156863, blue: 0.8392156863, alpha: 1); private static let teal = #colorLiteral(red: 0.537254902, green: 0.7450980392, blue: 0.6666666667, alpha: 1)
     private static let medTeal = #colorLiteral(red: 0.4274509804, green: 0.6117647059, blue: 0.6274509804, alpha: 1); private static let darkGreen = #colorLiteral(red: 0.05098039216, green: 0.2470588235, blue: 0.2549019608, alpha: 1)
     private static let darkestGreen = #colorLiteral(red: 0.02745098039, green: 0.1725490196, blue: 0.1803921569, alpha: 1); private static let lightBrown = #colorLiteral(red: 0.5882352941, green: 0.2980392157, blue: 0.1019607843, alpha: 1)
-    private static let medBrown = #colorLiteral(red: 0.4588235294, green: 0.1960784314, blue: 0.07843137255, alpha: 1); private static let brown = #colorLiteral(red: 0.4, green: 0.168627451, blue: 0.07450980392, alpha: 1)
-    private static let darkBrown = #colorLiteral(red: 0.337254902, green: 0.1411764706, blue: 0.06666666667, alpha: 1); private static let lightPink = #colorLiteral(red: 0.9215686275, green: 0.8235294118, blue: 0.8235294118, alpha: 1)
-    private static let pink = #colorLiteral(red: 0.7921568627, green: 0.431372549, blue: 0.568627451, alpha: 1); private static let darkPink = #colorLiteral(red: 0.7882352941, green: 0.2039215686, blue: 0.3529411765, alpha: 1)
-    private static let lightPurple = #colorLiteral(red: 0.662745098, green: 0.4666666667, blue: 0.6705882353, alpha: 1); private static let indigo = #colorLiteral(red: 0.3568627451, green: 0.3803921569, blue: 0.6078431373, alpha: 1)
-    private static let darknavy = #colorLiteral(red: 0.1137254902, green: 0.1490196078, blue: 0.2666666667, alpha: 1); private static let white = #colorLiteral(red: 1, green: 1, blue: 1, alpha: 1); private static let black = #colorLiteral(red: 0, green: 0, blue: 0, alpha: 1)
-    private static let buttonPink = #colorLiteral(red: 0.862745098, green: 0.5411764706, blue: 0.662745098, alpha: 1); private static let buttonTeal = #colorLiteral(red: 0.6470588235, green: 0.8549019608, blue: 0.8352941176, alpha: 1)
-    private static let buttonYellow = #colorLiteral(red: 1, green: 0.7882352941, blue: 0.3568627451, alpha: 1); private static let offWhite = #colorLiteral(red: 1, green: 0.9725490196, blue: 0.9607843137, alpha: 1)
+    private static let medBrown = #colorLiteral(red: 0.4588235294, green: 0.1960784314, blue: 0.07843137255, alpha: 1)
+    private static let brown = #colorLiteral(red: 0.4, green: 0.168627451, blue: 0.07450980392, alpha: 1)
+    private static let darkBrown = #colorLiteral(red: 0.337254902, green: 0.1411764706, blue: 0.06666666667, alpha: 1)
+    private static let lightPink = #colorLiteral(red: 0.9215686275, green: 0.8235294118, blue: 0.8235294118, alpha: 1)
+    private static let pink = #colorLiteral(red: 0.7921568627, green: 0.431372549, blue: 0.568627451, alpha: 1)
+    private static let darkPink = #colorLiteral(red: 0.7882352941, green: 0.2039215686, blue: 0.3529411765, alpha: 1)
+    private static let lightPurple = #colorLiteral(red: 0.662745098, green: 0.4666666667, blue: 0.6705882353, alpha: 1)
+    private static let indigo = #colorLiteral(red: 0.3568627451, green: 0.3803921569, blue: 0.6078431373, alpha: 1)
+    private static let darknavy = #colorLiteral(red: 0.1137254902, green: 0.1490196078, blue: 0.2666666667, alpha: 1)
+    private static let transparent = #colorLiteral(red: 1, green: 1, blue: 1, alpha: 0)
+    private static let white = #colorLiteral(red: 1, green: 1, blue: 1, alpha: 1)
+    private static let black = #colorLiteral(red: 0, green: 0, blue: 0, alpha: 1)
+    private static let buttonPink = #colorLiteral(red: 0.862745098, green: 0.5411764706, blue: 0.662745098, alpha: 1)
+    private static let buttonTeal = #colorLiteral(red: 0.6470588235, green: 0.8549019608, blue: 0.8352941176, alpha: 1)
+    private static let buttonYellow = #colorLiteral(red: 1, green: 0.7882352941, blue: 0.3568627451, alpha: 1)
+    private static let offWhite = #colorLiteral(red: 1, green: 0.9725490196, blue: 0.9607843137, alpha: 1)
     private static let transparent2 = #colorLiteral(red: 1, green: 1, blue: 1, alpha: 0)
-    // Hack 2025 color palette (color name + hex code)
-    public static let rawSienna = #colorLiteral(red: 0.8705882353, green: 0.5568627451, blue: 0.2705882353, alpha: 1) // #DE8E45
-    public static let neptune = #colorLiteral(red: 0.5176470588, green: 0.737254902, blue: 0.7254901961, alpha: 1) // #84BCB9
-    public static let lightningYellow = #colorLiteral(red: 0.9764705882, green: 0.7568627451, blue: 0.1490196078, alpha: 1) // #F9C126
-    public static let copper = #colorLiteral(red: 0.7725490196, green: 0.4039215686, blue: 0.2470588235, alpha: 1) // #C5673F
-    public static let metallicCopper = #colorLiteral(red: 0.4274509804, green: 0.1607843137, blue: 0.1019607843, alpha: 1) // #6D291A
-    public static let yellowOrange = #colorLiteral(red: 1.0, green: 0.6980392157, blue: 0.2431372549, alpha: 1) // #FFB23E
-    public static let muleFawn = #colorLiteral(red: 0.537254902, green: 0.2470588235, blue: 0.1843137255, alpha: 1) // #893F2F
-    public static let elephant = #colorLiteral(red: 0.05098039216, green: 0.2470588235, blue: 0.2549019608, alpha: 1) // #0D3F41
-    public static let transparent = #colorLiteral(red: 1, green: 1, blue: 1, alpha: 0)
-    public static let doveGray = #colorLiteral(red: 0.4235294118, green: 0.4235294118, blue: 0.4235294118, alpha: 1) // #6C6C6C
+    private static let navBarYellow = #colorLiteral(red: 0.9603472352, green: 0.9405072331, blue: 0.8672463298, alpha: 1)
     
     private static var statusBarWhite: UIStatusBarStyle {
         return .lightContent
@@ -151,10 +155,10 @@ struct HIAppearance: Equatable {
         contentBackground: offWhite,
         overlay: #colorLiteral(red: 0.05882352941, green: 0.07058823529, blue: 0.1803921569, alpha: 0.33),
         frostedTint: #colorLiteral(red: 0, green: 0.3411764706, blue: 0.462745098, alpha: 0.6),
-        codePopupTab: white,
+        codePopupTab: navBarYellow,
         greenCodePopupTab: darkestGreen,
-        navbarBackground: darkGreen,
-        navbarTabTint: white,
+        navbarBackground: navBarYellow,
+        navbarTabTint: black,
         profileContainerTint: yellowWhite,
         preferredStatusBarStyle: statusBarBlack,
         scrollViewIndicatorStyle: .black,
@@ -228,10 +232,10 @@ struct HIAppearance: Equatable {
         contentBackground: offWhite,
         overlay: #colorLiteral(red: 0.05882352941, green: 0.07058823529, blue: 0.1803921569, alpha: 0.33),
         frostedTint: #colorLiteral(red: 0, green: 0.3411764706, blue: 0.462745098, alpha: 0.6),
-        codePopupTab: white,
+        codePopupTab: navBarYellow,
         greenCodePopupTab: darkestGreen,
-        navbarBackground: darkGreen,
-        navbarTabTint: white,
+        navbarBackground: navBarYellow,
+        navbarTabTint: black,
         profileContainerTint: yellowWhite,
         preferredStatusBarStyle: statusBarBlack,
         scrollViewIndicatorStyle: .black,