177 files changed, 438 insertions, 283 deletions

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index a8cadf22..961d650a 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -402,6 +402,10 @@ PODS:
     - React
   - RNDeviceInfo (7.4.0):
     - React-Core
+  - RNFBAnalytics (11.2.0):
+    - Firebase/Analytics (~> 7.6.0)
+    - React-Core
+    - RNFBApp
   - RNFBApp (10.8.1):
     - Firebase/CoreOnly (~> 7.6.0)
     - React-Core
@@ -530,6 +534,7 @@ DEPENDENCIES:
   - "RNCAsyncStorage (from `../node_modules/@react-native-community/async-storage`)"
   - "RNCMaskedView (from `../node_modules/@react-native-community/masked-view`)"
   - RNDeviceInfo (from `../node_modules/react-native-device-info`)
+  - "RNFBAnalytics (from `../node_modules/@react-native-firebase/analytics`)"
   - "RNFBApp (from `../node_modules/@react-native-firebase/app`)"
   - "RNFBMessaging (from `../node_modules/@react-native-firebase/messaging`)"
   - RNFS (from `../node_modules/react-native-fs`)
@@ -651,6 +656,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/@react-native-community/masked-view"
   RNDeviceInfo:
     :path: "../node_modules/react-native-device-info"
+  RNFBAnalytics:
+    :path: "../node_modules/@react-native-firebase/analytics"
   RNFBApp:
     :path: "../node_modules/@react-native-firebase/app"
   RNFBMessaging:
@@ -741,6 +748,7 @@ SPEC CHECKSUMS:
   RNCAsyncStorage: b03032fdbdb725bea0bd9e5ec5a7272865ae7398
   RNCMaskedView: 5a8ec07677aa885546a0d98da336457e2bea557f
   RNDeviceInfo: 9538a884f862fe4aa0d7cead9f34e292d41ba8f6
+  RNFBAnalytics: 4b0a503b1c3b4c8175ca444e10fc12b9df6fd946
   RNFBApp: 02bde3edecf2e9694b908a5d3504e03449980f20
   RNFBMessaging: 1823217d31e942531cc3f51fb5367dcbc69c1e10
   RNFS: 2bd9eb49dc82fa9676382f0585b992c424cd59df
diff --git a/package.json b/package.json
index 658ed62c..07407eff 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
     "@react-native-community/cameraroll": "^4.0.4",
     "@react-native-community/masked-view": "^0.1.10",
     "@react-native-community/netinfo": "^6.0.0",
+    "@react-native-firebase/analytics": "^11.2.0",
     "@react-native-firebase/app": "^10.0.0",
     "@react-native-firebase/messaging": "^10.0.0",
     "@react-navigation/bottom-tabs": "^5.7.2",
diff --git a/src/App.tsx b/src/App.tsx
index 8d823e1f..64f40bae 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,9 +1,11 @@
+import analytics from '@react-native-firebase/analytics';
 import {NavigationContainer} from '@react-navigation/native';
-import React, {useState} from 'react';
+import React, {useRef, useState} from 'react';
 import {Provider} from 'react-redux';
 import {StreamChat} from 'stream-chat';
 import {OverlayProvider} from 'stream-chat-react-native';
 import {STREAM_CHAT_API} from './constants';
+import {getActiveRouteName} from './RootNavigation';
 import {navigationRef} from './RootNavigation';
 import Routes from './routes';
 import store from './store/configureStore';
@@ -23,6 +25,7 @@ import {isIPhoneX} from './utils';
 export const ChatContext = React.createContext({} as ChatContextType);
 
 const App = () => {
+  const routeNameRef = useRef();
   const [channel, setChannel] = useState<ChannelGroupedType>();
   const chatClient = StreamChat.getInstance<
     LocalAttachmentType,
@@ -34,11 +37,20 @@ const App = () => {
     LocalUserType
   >(STREAM_CHAT_API);
   return (
-    /**
-     * This is the provider from the redux store, it acts as the root provider for our application
-     */
     <Provider store={store}>
-      <NavigationContainer ref={navigationRef}>
+      <NavigationContainer
+        ref={navigationRef}
+        onStateChange={async (state) => {
+          const previousRouteName = routeNameRef.current;
+          const currentRouteName = getActiveRouteName(state);
+          if (previousRouteName !== currentRouteName) {
+            await analytics().logScreenView({
+              screen_name: currentRouteName,
+              screen_class: currentRouteName,
+            });
+          }
+          routeNameRef.current = currentRouteName;
+        }}>
         <OverlayProvider bottomInset={isIPhoneX() ? 80 : 50}>
           <ChatContext.Provider value={{channel, setChannel, chatClient}}>
             <Routes />
diff --git a/src/RootNavigation.ts b/src/RootNavigation.ts
index 827177a3..56ccfca4 100644
--- a/src/RootNavigation.ts
+++ b/src/RootNavigation.ts
@@ -1,5 +1,5 @@
 import {NavigationContainerRef} from '@react-navigation/native';
-import * as React from 'react';
+import React from 'react';
 
 export const navigationRef: React.RefObject<NavigationContainerRef> = React.createRef();
 
@@ -13,3 +13,14 @@ export function navigate(name: string) {
     // Ignore this, or add these actions to a queue you can call later
   }
 }
+
+export const getActiveRouteName = (state) => {
+  const route = state.routes[state?.index || 0];
+
+  if (route.state) {
+    // Dive into nested navigators
+    return getActiveRouteName(route.state);
+  }
+
+  return route.name;
+};
diff --git a/src/assets/badges/acacia.png b/src/assets/badges/acacia.png
new file mode 100644
index 00000000..062134a1
--- /dev/null
+++ b/src/assets/badges/acacia.png
diff --git a/src/assets/badges/brown/acapella.png b/src/assets/badges/acapella.png
index c0adb885..c0adb885 100644
--- a/src/assets/badges/brown/acapella.png
+++ b/src/assets/badges/acapella.png
diff --git a/src/assets/badges/alpha_chi_omega.png b/src/assets/badges/alpha_chi_omega.png
new file mode 100644
index 00000000..e250f498
--- /dev/null
+++ b/src/assets/badges/alpha_chi_omega.png
diff --git a/src/assets/badges/alpha_delta_phi.png b/src/assets/badges/alpha_delta_phi.png
new file mode 100644
index 00000000..96b725e9
--- /dev/null
+++ b/src/assets/badges/alpha_delta_phi.png
diff --git a/src/assets/badges/alpha_epsilon_phi.png b/src/assets/badges/alpha_epsilon_phi.png
new file mode 100644
index 00000000..fb8a27ea
--- /dev/null
+++ b/src/assets/badges/alpha_epsilon_phi.png
diff --git a/src/assets/badges/alpha_epsilon_pi.png b/src/assets/badges/alpha_epsilon_pi.png
new file mode 100644
index 00000000..c1896f6d
--- /dev/null
+++ b/src/assets/badges/alpha_epsilon_pi.png
diff --git a/src/assets/badges/alpha_gamma_rho.png b/src/assets/badges/alpha_gamma_rho.png
new file mode 100644
index 00000000..ab471f1d
--- /dev/null
+++ b/src/assets/badges/alpha_gamma_rho.png
diff --git a/src/assets/badges/alpha_kappa_delta_phi.png b/src/assets/badges/alpha_kappa_delta_phi.png
new file mode 100644
index 00000000..81df2b65
--- /dev/null
+++ b/src/assets/badges/alpha_kappa_delta_phi.png
diff --git a/src/assets/badges/alpha_phi.png b/src/assets/badges/alpha_phi.png
new file mode 100644
index 00000000..07200382
--- /dev/null
+++ b/src/assets/badges/alpha_phi.png
diff --git a/src/assets/badges/alpha_phi_alpha.png b/src/assets/badges/alpha_phi_alpha.png
new file mode 100644
index 00000000..4b494f8c
--- /dev/null
+++ b/src/assets/badges/alpha_phi_alpha.png
diff --git a/src/assets/badges/alpha_sigma_phi.png b/src/assets/badges/alpha_sigma_phi.png
new file mode 100644
index 00000000..52b59d3c
--- /dev/null
+++ b/src/assets/badges/alpha_sigma_phi.png
diff --git a/src/assets/badges/alpha_xi_delta.png b/src/assets/badges/alpha_xi_delta.png
new file mode 100644
index 00000000..5d010991
--- /dev/null
+++ b/src/assets/badges/alpha_xi_delta.png
diff --git a/src/assets/badges/alpha_zeta.png b/src/assets/badges/alpha_zeta.png
new file mode 100644
index 00000000..54193ab1
--- /dev/null
+++ b/src/assets/badges/alpha_zeta.png
diff --git a/src/assets/badges/baseball.png b/src/assets/badges/baseball.png
new file mode 100644
index 00000000..698db35f
--- /dev/null
+++ b/src/assets/badges/baseball.png
diff --git a/src/assets/badges/basketball.png b/src/assets/badges/basketball.png
new file mode 100644
index 00000000..4b58ac88
--- /dev/null
+++ b/src/assets/badges/basketball.png
diff --git a/src/assets/badges/brown/basketball.png b/src/assets/badges/basktball.png
index 43d08803..43d08803 100644
--- a/src/assets/badges/brown/basketball.png
+++ b/src/assets/badges/basktball.png
diff --git a/src/assets/badges/brown/beta_rho_pi.png b/src/assets/badges/beta_rho_pi.png
index 490acebb..490acebb 100644
--- a/src/assets/badges/brown/beta_rho_pi.png
+++ b/src/assets/badges/beta_rho_pi.png
diff --git a/src/assets/badges/beta_theta_pi.png b/src/assets/badges/beta_theta_pi.png
new file mode 100644
index 00000000..bac08125
--- /dev/null
+++ b/src/assets/badges/beta_theta_pi.png
diff --git a/src/assets/badges/brown/black_in_business.png b/src/assets/badges/black_in_business.png
index 995ae652..995ae652 100644
--- a/src/assets/badges/brown/black_in_business.png
+++ b/src/assets/badges/black_in_business.png
diff --git a/src/assets/badges/brown/alpha_chi_omega.png b/src/assets/badges/brown/alpha_chi_omega.png
deleted file mode 100644
index f6db85af..00000000
--- a/src/assets/badges/brown/alpha_chi_omega.png
+++ /dev/null
diff --git a/src/assets/badges/brown/alpha_delta_phi.png b/src/assets/badges/brown/alpha_delta_phi.png
deleted file mode 100644
index 51186468..00000000
--- a/src/assets/badges/brown/alpha_delta_phi.png
+++ /dev/null
diff --git a/src/assets/badges/brown/baseball.png b/src/assets/badges/brown/baseball.png
deleted file mode 100644
index 2a049c16..00000000
--- a/src/assets/badges/brown/baseball.png
+++ /dev/null
diff --git a/src/assets/badges/brown/brown_band.png b/src/assets/badges/brown_band.png
index bb21bcde..bb21bcde 100644
--- a/src/assets/badges/brown/brown_band.png
+++ b/src/assets/badges/brown_band.png
diff --git a/src/assets/badges/brown/brown_class_board.png b/src/assets/badges/brown_class_board.png
index a04e0a63..a04e0a63 100644
--- a/src/assets/badges/brown/brown_class_board.png
+++ b/src/assets/badges/brown_class_board.png
diff --git a/src/assets/badges/brown/brown_cs.png b/src/assets/badges/brown_cs.png
index 18c7165a..18c7165a 100644
--- a/src/assets/badges/brown/brown_cs.png
+++ b/src/assets/badges/brown_cs.png
diff --git a/src/assets/badges/brown/brown_democrats.png b/src/assets/badges/brown_democrats.png
index ba828a2a..ba828a2a 100644
--- a/src/assets/badges/brown/brown_democrats.png
+++ b/src/assets/badges/brown_democrats.png
diff --git a/src/assets/badges/brown/brown_ep.png b/src/assets/badges/brown_enrepreneurship.png
index c4f381b2..c4f381b2 100644
--- a/src/assets/badges/brown/brown_ep.png
+++ b/src/assets/badges/brown_enrepreneurship.png
diff --git a/src/assets/badges/brown/brown_womens_collective.png b/src/assets/badges/brown_womens_collective.png
index 242188ab..242188ab 100644
--- a/src/assets/badges/brown/brown_womens_collective.png
+++ b/src/assets/badges/brown_womens_collective.png
diff --git a/src/assets/badges/brown/bsu.png b/src/assets/badges/bsu.png
index 13838f32..13838f32 100644
--- a/src/assets/badges/brown/bsu.png
+++ b/src/assets/badges/bsu.png
diff --git a/src/assets/badges/brown/buxton_international.png b/src/assets/badges/buxton_international.png
index 2b1d33a3..2b1d33a3 100644
--- a/src/assets/badges/brown/buxton_international.png
+++ b/src/assets/badges/buxton_international.png
diff --git a/src/assets/badges/chi_phi.png b/src/assets/badges/chi_phi.png
new file mode 100644
index 00000000..6272469d
--- /dev/null
+++ b/src/assets/badges/chi_phi.png
diff --git a/src/assets/badges/chi_psi.png b/src/assets/badges/chi_psi.png
new file mode 100644
index 00000000..bf638213
--- /dev/null
+++ b/src/assets/badges/chi_psi.png
diff --git a/src/assets/badges/cornell/acacia.png b/src/assets/badges/cornell/acacia.png
deleted file mode 100644
index 2dc2b383..00000000
--- a/src/assets/badges/cornell/acacia.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/acapella.png b/src/assets/badges/cornell/acapella.png
deleted file mode 100644
index 2b56c9ad..00000000
--- a/src/assets/badges/cornell/acapella.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/aeta_phi_beta.png b/src/assets/badges/cornell/aeta_phi_beta.png
deleted file mode 100644
index 8816cac7..00000000
--- a/src/assets/badges/cornell/aeta_phi_beta.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/alpha_chi_omega.png b/src/assets/badges/cornell/alpha_chi_omega.png
deleted file mode 100644
index 304639ee..00000000
--- a/src/assets/badges/cornell/alpha_chi_omega.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/alpha_delta_phi.png b/src/assets/badges/cornell/alpha_delta_phi.png
deleted file mode 100644
index 89311e10..00000000
--- a/src/assets/badges/cornell/alpha_delta_phi.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/alpha_epsilon_phi.png b/src/assets/badges/cornell/alpha_epsilon_phi.png
deleted file mode 100644
index e35d1b24..00000000
--- a/src/assets/badges/cornell/alpha_epsilon_phi.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/alpha_gamma_rho.png b/src/assets/badges/cornell/alpha_gamma_rho.png
deleted file mode 100644
index 1b1f88ae..00000000
--- a/src/assets/badges/cornell/alpha_gamma_rho.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/alpha_kappa_delta_phi.png b/src/assets/badges/cornell/alpha_kappa_delta_phi.png
deleted file mode 100644
index cfc5b51c..00000000
--- a/src/assets/badges/cornell/alpha_kappa_delta_phi.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/alpha_phi.png b/src/assets/badges/cornell/alpha_phi.png
deleted file mode 100644
index dcf5d391..00000000
--- a/src/assets/badges/cornell/alpha_phi.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/alpha_phi_alpha.png b/src/assets/badges/cornell/alpha_phi_alpha.png
deleted file mode 100644
index 4dde66b3..00000000
--- a/src/assets/badges/cornell/alpha_phi_alpha.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/alpha_sigma_phi.png b/src/assets/badges/cornell/alpha_sigma_phi.png
deleted file mode 100644
index a63a6850..00000000
--- a/src/assets/badges/cornell/alpha_sigma_phi.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/alpha_xi_delta.png b/src/assets/badges/cornell/alpha_xi_delta.png
deleted file mode 100644
index 47f8108c..00000000
--- a/src/assets/badges/cornell/alpha_xi_delta.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/alpha_zeta.png b/src/assets/badges/cornell/alpha_zeta.png
deleted file mode 100644
index 1942f775..00000000
--- a/src/assets/badges/cornell/alpha_zeta.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/alphs_epsilon_pi.png b/src/assets/badges/cornell/alphs_epsilon_pi.png
deleted file mode 100644
index 0480edc2..00000000
--- a/src/assets/badges/cornell/alphs_epsilon_pi.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/baseball.png b/src/assets/badges/cornell/baseball.png
deleted file mode 100644
index 5643f9b8..00000000
--- a/src/assets/badges/cornell/baseball.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/basketball.png b/src/assets/badges/cornell/basketball.png
deleted file mode 100644
index d2a8f04a..00000000
--- a/src/assets/badges/cornell/basketball.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/beta_theta_pi.png b/src/assets/badges/cornell/beta_theta_pi.png
deleted file mode 100644
index ae09a5b6..00000000
--- a/src/assets/badges/cornell/beta_theta_pi.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/chi_phi.png b/src/assets/badges/cornell/chi_phi.png
deleted file mode 100644
index 199213c9..00000000
--- a/src/assets/badges/cornell/chi_phi.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/chi_psi.png b/src/assets/badges/cornell/chi_psi.png
deleted file mode 100644
index e9ad6540..00000000
--- a/src/assets/badges/cornell/chi_psi.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/delta_chi.png b/src/assets/badges/cornell/delta_chi.png
deleted file mode 100644
index 116c1ae7..00000000
--- a/src/assets/badges/cornell/delta_chi.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/delta_delta_delta.png b/src/assets/badges/cornell/delta_delta_delta.png
deleted file mode 100644
index 93d92ce3..00000000
--- a/src/assets/badges/cornell/delta_delta_delta.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/delta_epsilon.png b/src/assets/badges/cornell/delta_epsilon.png
deleted file mode 100644
index 2f7ef7ca..00000000
--- a/src/assets/badges/cornell/delta_epsilon.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/delta_gamma.png b/src/assets/badges/cornell/delta_gamma.png
deleted file mode 100644
index 218ac7a6..00000000
--- a/src/assets/badges/cornell/delta_gamma.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/delta_kappa_epsilon.png b/src/assets/badges/cornell/delta_kappa_epsilon.png
deleted file mode 100644
index 12bd6e37..00000000
--- a/src/assets/badges/cornell/delta_kappa_epsilon.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/delta_sigma_theta.png b/src/assets/badges/cornell/delta_sigma_theta.png
deleted file mode 100644
index d70d4220..00000000
--- a/src/assets/badges/cornell/delta_sigma_theta.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/delta_tau_delta.png b/src/assets/badges/cornell/delta_tau_delta.png
deleted file mode 100644
index 02011fc1..00000000
--- a/src/assets/badges/cornell/delta_tau_delta.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/fencing.png b/src/assets/badges/cornell/fencing.png
deleted file mode 100644
index c2649533..00000000
--- a/src/assets/badges/cornell/fencing.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/field_hockey.png b/src/assets/badges/cornell/field_hockey.png
deleted file mode 100644
index 5405e392..00000000
--- a/src/assets/badges/cornell/field_hockey.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/football.png b/src/assets/badges/cornell/football.png
deleted file mode 100644
index bcc44778..00000000
--- a/src/assets/badges/cornell/football.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/golf.png b/src/assets/badges/cornell/golf.png
deleted file mode 100644
index 92f8f394..00000000
--- a/src/assets/badges/cornell/golf.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/gymnastics.png b/src/assets/badges/cornell/gymnastics.png
deleted file mode 100644
index 2f6c4fae..00000000
--- a/src/assets/badges/cornell/gymnastics.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/hockey.png b/src/assets/badges/cornell/hockey.png
deleted file mode 100644
index 0d1f1294..00000000
--- a/src/assets/badges/cornell/hockey.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/kappa_alpha_theta.png b/src/assets/badges/cornell/kappa_alpha_theta.png
deleted file mode 100644
index dadc7f86..00000000
--- a/src/assets/badges/cornell/kappa_alpha_theta.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/kappa_delta.png b/src/assets/badges/cornell/kappa_delta.png
deleted file mode 100644
index 1f9b4e06..00000000
--- a/src/assets/badges/cornell/kappa_delta.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/kappa_delta_rho.png b/src/assets/badges/cornell/kappa_delta_rho.png
deleted file mode 100644
index c32c7c70..00000000
--- a/src/assets/badges/cornell/kappa_delta_rho.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/kappa_kappa_gamma.png b/src/assets/badges/cornell/kappa_kappa_gamma.png
deleted file mode 100644
index 7583ebfd..00000000
--- a/src/assets/badges/cornell/kappa_kappa_gamma.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/kappa_phi_lambda.png b/src/assets/badges/cornell/kappa_phi_lambda.png
deleted file mode 100644
index f3dd4a49..00000000
--- a/src/assets/badges/cornell/kappa_phi_lambda.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/kappa_sigma.png b/src/assets/badges/cornell/kappa_sigma.png
deleted file mode 100644
index 7df2efa5..00000000
--- a/src/assets/badges/cornell/kappa_sigma.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/la_unidad_latina,_lambda.png b/src/assets/badges/cornell/la_unidad_latina,_lambda.png
deleted file mode 100644
index f8017b9f..00000000
--- a/src/assets/badges/cornell/la_unidad_latina,_lambda.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/lacrosse.png b/src/assets/badges/cornell/lacrosse.png
deleted file mode 100644
index 100ae33b..00000000
--- a/src/assets/badges/cornell/lacrosse.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/lambda_chi_alpha.png b/src/assets/badges/cornell/lambda_chi_alpha.png
deleted file mode 100644
index 9360a226..00000000
--- a/src/assets/badges/cornell/lambda_chi_alpha.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/lambda_phi_epsilon_international.png b/src/assets/badges/cornell/lambda_phi_epsilon_international.png
deleted file mode 100644
index f2721927..00000000
--- a/src/assets/badges/cornell/lambda_phi_epsilon_international.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/malik.png b/src/assets/badges/cornell/malik.png
deleted file mode 100644
index ac221d24..00000000
--- a/src/assets/badges/cornell/malik.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/phi_beta_phi.png b/src/assets/badges/cornell/phi_beta_phi.png
deleted file mode 100644
index 8d46dd2e..00000000
--- a/src/assets/badges/cornell/phi_beta_phi.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/phi_beta_sigma.png b/src/assets/badges/cornell/phi_beta_sigma.png
deleted file mode 100644
index 49e636dc..00000000
--- a/src/assets/badges/cornell/phi_beta_sigma.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/phi_delta_theta.png b/src/assets/badges/cornell/phi_delta_theta.png
deleted file mode 100644
index 55ff15dc..00000000
--- a/src/assets/badges/cornell/phi_delta_theta.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/phi_kappa_tau.png b/src/assets/badges/cornell/phi_kappa_tau.png
deleted file mode 100644
index b1c01ab1..00000000
--- a/src/assets/badges/cornell/phi_kappa_tau.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/phi_mu.png b/src/assets/badges/cornell/phi_mu.png
deleted file mode 100644
index 0049a584..00000000
--- a/src/assets/badges/cornell/phi_mu.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/phi_sigma_kappa.png b/src/assets/badges/cornell/phi_sigma_kappa.png
deleted file mode 100644
index 9249db92..00000000
--- a/src/assets/badges/cornell/phi_sigma_kappa.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/phi_sigma_sigma.png b/src/assets/badges/cornell/phi_sigma_sigma.png
deleted file mode 100644
index 889dc14f..00000000
--- a/src/assets/badges/cornell/phi_sigma_sigma.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/pi_delta_psi.png b/src/assets/badges/cornell/pi_delta_psi.png
deleted file mode 100644
index 164c4483..00000000
--- a/src/assets/badges/cornell/pi_delta_psi.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/pi_kappa_alpha.png b/src/assets/badges/cornell/pi_kappa_alpha.png
deleted file mode 100644
index 08a3153e..00000000
--- a/src/assets/badges/cornell/pi_kappa_alpha.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/pi_kappa_phi.png b/src/assets/badges/cornell/pi_kappa_phi.png
deleted file mode 100644
index 0a1dee58..00000000
--- a/src/assets/badges/cornell/pi_kappa_phi.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/polo.png b/src/assets/badges/cornell/polo.png
deleted file mode 100644
index 05758440..00000000
--- a/src/assets/badges/cornell/polo.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/rowing.png b/src/assets/badges/cornell/rowing.png
deleted file mode 100644
index 28e4436f..00000000
--- a/src/assets/badges/cornell/rowing.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/sailing.png b/src/assets/badges/cornell/sailing.png
deleted file mode 100644
index ea8d3a11..00000000
--- a/src/assets/badges/cornell/sailing.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/sigma_alpha_mu.png b/src/assets/badges/cornell/sigma_alpha_mu.png
deleted file mode 100644
index d05a8fed..00000000
--- a/src/assets/badges/cornell/sigma_alpha_mu.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/sigma_chi.png b/src/assets/badges/cornell/sigma_chi.png
deleted file mode 100644
index 0ca28bb3..00000000
--- a/src/assets/badges/cornell/sigma_chi.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/sigma_delta_tau.png b/src/assets/badges/cornell/sigma_delta_tau.png
deleted file mode 100644
index f0863d8d..00000000
--- a/src/assets/badges/cornell/sigma_delta_tau.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/sigma_phi_society.png b/src/assets/badges/cornell/sigma_phi_society.png
deleted file mode 100644
index 478922c8..00000000
--- a/src/assets/badges/cornell/sigma_phi_society.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/sigma_pi.png b/src/assets/badges/cornell/sigma_pi.png
deleted file mode 100644
index c5cb5ce3..00000000
--- a/src/assets/badges/cornell/sigma_pi.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/soccer.png b/src/assets/badges/cornell/soccer.png
deleted file mode 100644
index e17d76de..00000000
--- a/src/assets/badges/cornell/soccer.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/softball.png b/src/assets/badges/cornell/softball.png
deleted file mode 100644
index fda13c9a..00000000
--- a/src/assets/badges/cornell/softball.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/squash.png b/src/assets/badges/cornell/squash.png
deleted file mode 100644
index 5d6c3f0e..00000000
--- a/src/assets/badges/cornell/squash.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/swimming_&_diving.png b/src/assets/badges/cornell/swimming_&_diving.png
deleted file mode 100644
index aed8f37e..00000000
--- a/src/assets/badges/cornell/swimming_&_diving.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/tennis.png b/src/assets/badges/cornell/tennis.png
deleted file mode 100644
index 24ea81e4..00000000
--- a/src/assets/badges/cornell/tennis.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/theta_delta_chi.png b/src/assets/badges/cornell/theta_delta_chi.png
deleted file mode 100644
index 7a2bf4e8..00000000
--- a/src/assets/badges/cornell/theta_delta_chi.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/track_&_field.png b/src/assets/badges/cornell/track_&_field.png
deleted file mode 100644
index 05644dc4..00000000
--- a/src/assets/badges/cornell/track_&_field.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/volleyball.png b/src/assets/badges/cornell/volleyball.png
deleted file mode 100644
index 9ea08622..00000000
--- a/src/assets/badges/cornell/volleyball.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/wrestling.png b/src/assets/badges/cornell/wrestling.png
deleted file mode 100644
index 28892124..00000000
--- a/src/assets/badges/cornell/wrestling.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/zeta_beta_tau.png b/src/assets/badges/cornell/zeta_beta_tau.png
deleted file mode 100644
index 4572bf01..00000000
--- a/src/assets/badges/cornell/zeta_beta_tau.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/zeta_phi_beta.png b/src/assets/badges/cornell/zeta_phi_beta.png
deleted file mode 100644
index 8816cac7..00000000
--- a/src/assets/badges/cornell/zeta_phi_beta.png
+++ /dev/null
diff --git a/src/assets/badges/cornell/zeta_psi.png b/src/assets/badges/cornell/zeta_psi.png
deleted file mode 100644
index ad245931..00000000
--- a/src/assets/badges/cornell/zeta_psi.png
+++ /dev/null
diff --git a/src/assets/badges/delta_chi.png b/src/assets/badges/delta_chi.png
new file mode 100644
index 00000000..77297a72
--- /dev/null
+++ b/src/assets/badges/delta_chi.png
diff --git a/src/assets/badges/delta_delta_delta.png b/src/assets/badges/delta_delta_delta.png
new file mode 100644
index 00000000..ee275a4f
--- /dev/null
+++ b/src/assets/badges/delta_delta_delta.png
diff --git a/src/assets/badges/brown/delta_gamma.png b/src/assets/badges/delta_gamma.png
index 4f1aa675..4f1aa675 100644
--- a/src/assets/badges/brown/delta_gamma.png
+++ b/src/assets/badges/delta_gamma.png
diff --git a/src/assets/badges/delta_kappa_epsilon.png b/src/assets/badges/delta_kappa_epsilon.png
new file mode 100644
index 00000000..616bcb22
--- /dev/null
+++ b/src/assets/badges/delta_kappa_epsilon.png
diff --git a/src/assets/badges/delta_pi.png b/src/assets/badges/delta_pi.png
new file mode 100644
index 00000000..67c3a905
--- /dev/null
+++ b/src/assets/badges/delta_pi.png
diff --git a/src/assets/badges/delta_sigma_theta.png b/src/assets/badges/delta_sigma_theta.png
new file mode 100644
index 00000000..dfd03d59
--- /dev/null
+++ b/src/assets/badges/delta_sigma_theta.png
diff --git a/src/assets/badges/brown/delta_tau.png b/src/assets/badges/delta_tau.png
index 80d2a373..80d2a373 100644
--- a/src/assets/badges/brown/delta_tau.png
+++ b/src/assets/badges/delta_tau.png
diff --git a/src/assets/badges/delta_tau_delta.png b/src/assets/badges/delta_tau_delta.png
new file mode 100644
index 00000000..6a108754
--- /dev/null
+++ b/src/assets/badges/delta_tau_delta.png
diff --git a/src/assets/badges/delta_upsilon.png b/src/assets/badges/delta_upsilon.png
new file mode 100644
index 00000000..d813a69e
--- /dev/null
+++ b/src/assets/badges/delta_upsilon.png
diff --git a/src/assets/badges/brown/fashion_at_brown.png b/src/assets/badges/fashion_at_brown.png
index a60b65fc..a60b65fc 100644
--- a/src/assets/badges/brown/fashion_at_brown.png
+++ b/src/assets/badges/fashion_at_brown.png
diff --git a/src/assets/badges/fencing.png b/src/assets/badges/fencing.png
new file mode 100644
index 00000000..9a292a0b
--- /dev/null
+++ b/src/assets/badges/fencing.png
diff --git a/src/assets/badges/brown/field_hockey.png b/src/assets/badges/field_hockey.png
index 7f08587e..7f08587e 100644
--- a/src/assets/badges/brown/field_hockey.png
+++ b/src/assets/badges/field_hockey.png
diff --git a/src/assets/badges/brown/football.png b/src/assets/badges/football.png
index 1a5c0f4f..1a5c0f4f 100644
--- a/src/assets/badges/brown/football.png
+++ b/src/assets/badges/football.png
diff --git a/src/assets/badges/golf.png b/src/assets/badges/golf.png
new file mode 100644
index 00000000..9c63864e
--- /dev/null
+++ b/src/assets/badges/golf.png
diff --git a/src/assets/badges/brown/gymnastics.png b/src/assets/badges/gymnastics.png
index 64735dd2..64735dd2 100644
--- a/src/assets/badges/brown/gymnastics.png
+++ b/src/assets/badges/gymnastics.png
diff --git a/src/assets/badges/brown/hockey.png b/src/assets/badges/hockey.png
index 2cfd547e..2cfd547e 100644
--- a/src/assets/badges/brown/hockey.png
+++ b/src/assets/badges/hockey.png
diff --git a/src/assets/badges/brown/iff.png b/src/assets/badges/iff.png
index 02f9a1c8..02f9a1c8 100644
--- a/src/assets/badges/brown/iff.png
+++ b/src/assets/badges/iff.png
diff --git a/src/assets/badges/brown/impulse.png b/src/assets/badges/impulse_and_mezcla.png
index 68a73028..68a73028 100644
--- a/src/assets/badges/brown/impulse.png
+++ b/src/assets/badges/impulse_and_mezcla.png
diff --git a/src/assets/badges/kappa_alpha_theta.png b/src/assets/badges/kappa_alpha_theta.png
new file mode 100644
index 00000000..8290bb87
--- /dev/null
+++ b/src/assets/badges/kappa_alpha_theta.png
diff --git a/src/assets/badges/brown/kappa_delta.png b/src/assets/badges/kappa_delta.png
index 7a3fdb25..7a3fdb25 100644
--- a/src/assets/badges/brown/kappa_delta.png
+++ b/src/assets/badges/kappa_delta.png
diff --git a/src/assets/badges/kappa_delta_rho.png b/src/assets/badges/kappa_delta_rho.png
new file mode 100644
index 00000000..c155d5e5
--- /dev/null
+++ b/src/assets/badges/kappa_delta_rho.png
diff --git a/src/assets/badges/kappa_kappa_gamma.png b/src/assets/badges/kappa_kappa_gamma.png
new file mode 100644
index 00000000..2fcedc1d
--- /dev/null
+++ b/src/assets/badges/kappa_kappa_gamma.png
diff --git a/src/assets/badges/kappa_phi_lambda.png b/src/assets/badges/kappa_phi_lambda.png
new file mode 100644
index 00000000..a700cb3d
--- /dev/null
+++ b/src/assets/badges/kappa_phi_lambda.png
diff --git a/src/assets/badges/kappa_sigma.png b/src/assets/badges/kappa_sigma.png
new file mode 100644
index 00000000..6dc77392
--- /dev/null
+++ b/src/assets/badges/kappa_sigma.png
diff --git a/src/assets/badges/la_unidad_latina_lambda.png b/src/assets/badges/la_unidad_latina_lambda.png
new file mode 100644
index 00000000..ee67cda5
--- /dev/null
+++ b/src/assets/badges/la_unidad_latina_lambda.png
diff --git a/src/assets/badges/brown/lacrosse.png b/src/assets/badges/lacrosse.png
index 67ac8f5e..67ac8f5e 100644
--- a/src/assets/badges/brown/lacrosse.png
+++ b/src/assets/badges/lacrosse.png
diff --git a/src/assets/badges/lambda_chi_alpha.png b/src/assets/badges/lambda_chi_alpha.png
new file mode 100644
index 00000000..89cca602
--- /dev/null
+++ b/src/assets/badges/lambda_chi_alpha.png
diff --git a/src/assets/badges/lambda_phi_epsilon_international.png b/src/assets/badges/lambda_phi_epsilon_international.png
new file mode 100644
index 00000000..9b7e0541
--- /dev/null
+++ b/src/assets/badges/lambda_phi_epsilon_international.png
diff --git a/src/assets/badges/brown/latin_at_brown.png b/src/assets/badges/latin_at_brown.png
index 515599f9..515599f9 100644
--- a/src/assets/badges/brown/latin_at_brown.png
+++ b/src/assets/badges/latin_at_brown.png
diff --git a/src/assets/badges/malik.png b/src/assets/badges/malik.png
new file mode 100644
index 00000000..2155cae4
--- /dev/null
+++ b/src/assets/badges/malik.png
diff --git a/src/assets/badges/phi_beta_phi.png b/src/assets/badges/phi_beta_phi.png
new file mode 100644
index 00000000..46a8d10e
--- /dev/null
+++ b/src/assets/badges/phi_beta_phi.png
diff --git a/src/assets/badges/phi_beta_sigma.png b/src/assets/badges/phi_beta_sigma.png
new file mode 100644
index 00000000..284f316c
--- /dev/null
+++ b/src/assets/badges/phi_beta_sigma.png
diff --git a/src/assets/badges/phi_delta_theta.png b/src/assets/badges/phi_delta_theta.png
new file mode 100644
index 00000000..3391a73a
--- /dev/null
+++ b/src/assets/badges/phi_delta_theta.png
diff --git a/src/assets/badges/phi_kappa_tau.png b/src/assets/badges/phi_kappa_tau.png
new file mode 100644
index 00000000..e1233268
--- /dev/null
+++ b/src/assets/badges/phi_kappa_tau.png
diff --git a/src/assets/badges/phi_mu.png b/src/assets/badges/phi_mu.png
new file mode 100644
index 00000000..3e462e49
--- /dev/null
+++ b/src/assets/badges/phi_mu.png
diff --git a/src/assets/badges/phi_sigma_kappa.png b/src/assets/badges/phi_sigma_kappa.png
new file mode 100644
index 00000000..82446c99
--- /dev/null
+++ b/src/assets/badges/phi_sigma_kappa.png
diff --git a/src/assets/badges/phi_sigma_sigma.png b/src/assets/badges/phi_sigma_sigma.png
new file mode 100644
index 00000000..ea719717
--- /dev/null
+++ b/src/assets/badges/phi_sigma_sigma.png
diff --git a/src/assets/badges/pi_delta_psi.png b/src/assets/badges/pi_delta_psi.png
new file mode 100644
index 00000000..78c94e37
--- /dev/null
+++ b/src/assets/badges/pi_delta_psi.png
diff --git a/src/assets/badges/pi_kappa_alpha.png b/src/assets/badges/pi_kappa_alpha.png
new file mode 100644
index 00000000..e6ead1f5
--- /dev/null
+++ b/src/assets/badges/pi_kappa_alpha.png
diff --git a/src/assets/badges/pi_kappa_phi.png b/src/assets/badges/pi_kappa_phi.png
new file mode 100644
index 00000000..1ca81a97
--- /dev/null
+++ b/src/assets/badges/pi_kappa_phi.png
diff --git a/src/assets/badges/polo.png b/src/assets/badges/polo.png
new file mode 100644
index 00000000..efe86dd1
--- /dev/null
+++ b/src/assets/badges/polo.png
diff --git a/src/assets/badges/rowing.png b/src/assets/badges/rowing.png
new file mode 100644
index 00000000..f7b67fc9
--- /dev/null
+++ b/src/assets/badges/rowing.png
diff --git a/src/assets/badges/brown/sailing.png b/src/assets/badges/sailing.png
index 1fde1c39..1fde1c39 100644
--- a/src/assets/badges/brown/sailing.png
+++ b/src/assets/badges/sailing.png
diff --git a/src/assets/badges/sigma_alpha_mu.png b/src/assets/badges/sigma_alpha_mu.png
new file mode 100644
index 00000000..a40f5d41
--- /dev/null
+++ b/src/assets/badges/sigma_alpha_mu.png
diff --git a/src/assets/badges/sigma_chi.png b/src/assets/badges/sigma_chi.png
new file mode 100644
index 00000000..654bfcc2
--- /dev/null
+++ b/src/assets/badges/sigma_chi.png
diff --git a/src/assets/badges/sigma_delta_tau.png b/src/assets/badges/sigma_delta_tau.png
new file mode 100644
index 00000000..b52b201e
--- /dev/null
+++ b/src/assets/badges/sigma_delta_tau.png
diff --git a/src/assets/badges/sigma_phi_society.png b/src/assets/badges/sigma_phi_society.png
new file mode 100644
index 00000000..34dabd94
--- /dev/null
+++ b/src/assets/badges/sigma_phi_society.png
diff --git a/src/assets/badges/sigma_pi.png b/src/assets/badges/sigma_pi.png
new file mode 100644
index 00000000..89817c11
--- /dev/null
+++ b/src/assets/badges/sigma_pi.png
diff --git a/src/assets/badges/brown/soccer.png b/src/assets/badges/soccer.png
index f2202510..f2202510 100644
--- a/src/assets/badges/brown/soccer.png
+++ b/src/assets/badges/soccer.png
diff --git a/src/assets/badges/brown/softball.png b/src/assets/badges/softball.png
index 2a049c16..2a049c16 100644
--- a/src/assets/badges/brown/softball.png
+++ b/src/assets/badges/softball.png
diff --git a/src/assets/badges/squash.png b/src/assets/badges/squash.png
new file mode 100644
index 00000000..3ddb85e8
--- /dev/null
+++ b/src/assets/badges/squash.png
diff --git a/src/assets/badges/swimming_and_diving.png b/src/assets/badges/swimming_and_diving.png
new file mode 100644
index 00000000..580ef886
--- /dev/null
+++ b/src/assets/badges/swimming_and_diving.png
diff --git a/src/assets/badges/brown/tap.png b/src/assets/badges/tap.png
index e6db8470..e6db8470 100644
--- a/src/assets/badges/brown/tap.png
+++ b/src/assets/badges/tap.png
diff --git a/src/assets/badges/brown/tennis.png b/src/assets/badges/tennis.png
index 358cb8c7..358cb8c7 100644
--- a/src/assets/badges/brown/tennis.png
+++ b/src/assets/badges/tennis.png
diff --git a/src/assets/badges/brown/theta_alpha.png b/src/assets/badges/theta_alpha.png
index 323b538e..323b538e 100644
--- a/src/assets/badges/brown/theta_alpha.png
+++ b/src/assets/badges/theta_alpha.png
diff --git a/src/assets/badges/theta_delta_chi.png b/src/assets/badges/theta_delta_chi.png
new file mode 100644
index 00000000..c00ed96e
--- /dev/null
+++ b/src/assets/badges/theta_delta_chi.png
diff --git a/src/assets/badges/brown/track.png b/src/assets/badges/track.png
index 5bcff810..5bcff810 100644
--- a/src/assets/badges/brown/track.png
+++ b/src/assets/badges/track.png
diff --git a/src/assets/badges/track_and_field.png b/src/assets/badges/track_and_field.png
new file mode 100644
index 00000000..5d1f31e8
--- /dev/null
+++ b/src/assets/badges/track_and_field.png
diff --git a/src/assets/badges/brown/ucs.png b/src/assets/badges/ucs.png
index 1009dc9b..1009dc9b 100644
--- a/src/assets/badges/brown/ucs.png
+++ b/src/assets/badges/ucs.png
diff --git a/src/assets/badges/brown/volleyball.png b/src/assets/badges/volleyball.png
index 915b467c..915b467c 100644
--- a/src/assets/badges/brown/volleyball.png
+++ b/src/assets/badges/volleyball.png
diff --git a/src/assets/badges/brown/women_in_business.png b/src/assets/badges/women_in_business.png
index 1a504676..1a504676 100644
--- a/src/assets/badges/brown/women_in_business.png
+++ b/src/assets/badges/women_in_business.png
diff --git a/src/assets/badges/wrestling.png b/src/assets/badges/wrestling.png
new file mode 100644
index 00000000..e6c9a0b0
--- /dev/null
+++ b/src/assets/badges/wrestling.png
diff --git a/src/assets/badges/zeta_beta_tau.png b/src/assets/badges/zeta_beta_tau.png
new file mode 100644
index 00000000..e3b11e13
--- /dev/null
+++ b/src/assets/badges/zeta_beta_tau.png
diff --git a/src/assets/badges/brown/zeta_delta_xi.png b/src/assets/badges/zeta_delta_xi.png
index 7880d2b7..7880d2b7 100644
--- a/src/assets/badges/brown/zeta_delta_xi.png
+++ b/src/assets/badges/zeta_delta_xi.png
diff --git a/src/assets/badges/zeta_phi_beta.png b/src/assets/badges/zeta_phi_beta.png
new file mode 100644
index 00000000..ed668004
--- /dev/null
+++ b/src/assets/badges/zeta_phi_beta.png
diff --git a/src/assets/badges/zeta_psi.png b/src/assets/badges/zeta_psi.png
new file mode 100644
index 00000000..c528e418
--- /dev/null
+++ b/src/assets/badges/zeta_psi.png
diff --git a/src/constants/badges.ts b/src/constants/badges.ts
index d7e9357b..d436631b 100644
--- a/src/constants/badges.ts
+++ b/src/constants/badges.ts
@@ -1,191 +1,162 @@
 import {BadgeDataType} from '../types';
 
-export const _brownBadgeImages = {
-  acapella: require('../assets/badges/brown/acapella.png'),
-  alpha_chi_omega: require('../assets/badges/brown/alpha_chi_omega.png'),
-  alpha_delta_phi: require('../assets/badges/brown/alpha_delta_phi.png'),
-  baseball: require('../assets/badges/brown/baseball.png'),
-  basketball: require('../assets/badges/brown/basketball.png'),
-  beta_rho_pi: require('../assets/badges/brown/beta_rho_pi.png'),
-  black_in_business: require('../assets/badges/brown/black_in_business.png'),
-  brown_band: require('../assets/badges/brown/brown_band.png'),
-  brown_class_board: require('../assets/badges/brown/brown_class_board.png'),
-  brown_cs: require('../assets/badges/brown/brown_cs.png'),
-  brown_democrats: require('../assets/badges/brown/brown_democrats.png'),
-  brown_ep: require('../assets/badges/brown/brown_ep.png'),
-  brown_womens_collective: require('../assets/badges/brown/brown_womens_collective.png'),
-  bsu: require('../assets/badges/brown/bsu.png'),
-  buxton_international: require('../assets/badges/brown/buxton_international.png'),
-  delta_gamma: require('../assets/badges/brown/delta_gamma.png'),
-  delta_tau: require('../assets/badges/brown/delta_tau.png'),
-  fashion_at_brown: require('../assets/badges/brown/fashion_at_brown.png'),
-  field_hockey: require('../assets/badges/brown/field_hockey.png'),
-  football: require('../assets/badges/brown/football.png'),
-  gymnastics: require('../assets/badges/brown/gymnastics.png'),
-  hockey: require('../assets/badges/brown/hockey.png'),
-  iff: require('../assets/badges/brown/iff.png'),
-  impulse: require('../assets/badges/brown/impulse.png'),
-  kappa_delta: require('../assets/badges/brown/kappa_delta.png'),
-  lacrosse: require('../assets/badges/brown/lacrosse.png'),
-  latin_at_brown: require('../assets/badges/brown/latin_at_brown.png'),
-  sailing: require('../assets/badges/brown/sailing.png'),
-  soccer: require('../assets/badges/brown/soccer.png'),
-  softball: require('../assets/badges/brown/softball.png'),
-  tap: require('../assets/badges/brown/tap.png'),
-  tennis: require('../assets/badges/brown/tennis.png'),
-  theta_alpha: require('../assets/badges/brown/theta_alpha.png'),
-  track: require('../assets/badges/brown/track.png'),
-  ucs: require('../assets/badges/brown/ucs.png'),
-  volleyball: require('../assets/badges/brown/volleyball.png'),
-  women_in_business: require('../assets/badges/brown/women_in_business.png'),
-  zeta_delta_xi: require('../assets/badges/brown/zeta_delta_xi.png'),
+export const _badgeImages = {
+  acacia: require('../assets/badges/acacia.png'),
+  acapella: require('../assets/badges/acapella.png'),
+  alpha_chi_omega: require('../assets/badges/alpha_chi_omega.png'),
+  alpha_delta_phi: require('../assets/badges/alpha_delta_phi.png'),
+  alpha_epsilon_phi: require('../assets/badges/alpha_epsilon_phi.png'),
+  alpha_epsilon_pi: require('../assets/badges/alpha_epsilon_pi.png'),
+  alpha_gamma_rho: require('../assets/badges/alpha_gamma_rho.png'),
+  alpha_kappa_delta_phi: require('../assets/badges/alpha_kappa_delta_phi.png'),
+  alpha_phi: require('../assets/badges/alpha_phi.png'),
+  alpha_phi_alpha: require('../assets/badges/alpha_phi_alpha.png'),
+  alpha_sigma_phi: require('../assets/badges/alpha_sigma_phi.png'),
+  alpha_xi_delta: require('../assets/badges/alpha_xi_delta.png'),
+  alpha_zeta: require('../assets/badges/alpha_zeta.png'),
+  baseball: require('../assets/badges/baseball.png'),
+  basketball: require('../assets/badges/basketball.png'),
+  beta_rho_pi: require('../assets/badges/beta_rho_pi.png'),
+  beta_theta_pi: require('../assets/badges/beta_theta_pi.png'),
+  black_in_business: require('../assets/badges/black_in_business.png'),
+  brown_class_board: require('../assets/badges/brown_class_board.png'),
+  brown_cs: require('../assets/badges/brown_cs.png'),
+  brown_enrepreneurship: require('../assets/badges/brown_enrepreneurship.png'),
+  brown_womens_collective: require('../assets/badges/brown_womens_collective.png'),
+  bsu: require('../assets/badges/bsu.png'),
+  buxton_international: require('../assets/badges/buxton_international.png'),
+  chi_phi: require('../assets/badges/chi_phi.png'),
+  chi_psi: require('../assets/badges/chi_psi.png'),
+  delta_chi: require('../assets/badges/delta_chi.png'),
+  delta_delta_delta: require('../assets/badges/delta_delta_delta.png'),
+  delta_gamma: require('../assets/badges/delta_gamma.png'),
+  delta_kappa_epsilon: require('../assets/badges/delta_kappa_epsilon.png'),
+  delta_sigma_theta: require('../assets/badges/delta_sigma_theta.png'),
+  delta_tau: require('../assets/badges/delta_tau.png'),
+  delta_tau_delta: require('../assets/badges/delta_tau_delta.png'),
+  delta_upsilon: require('../assets/badges/delta_upsilon.png'),
+  fashion_at_brown: require('../assets/badges/fashion_at_brown.png'),
+  fencing: require('../assets/badges/fencing.png'),
+  field_hockey: require('../assets/badges/field_hockey.png'),
+  football: require('../assets/badges/football.png'),
+  golf: require('../assets/badges/golf.png'),
+  gymnastics: require('../assets/badges/gymnastics.png'),
+  hockey: require('../assets/badges/hockey.png'),
+  impulse_and_mezcla: require('../assets/badges/impulse_and_mezcla.png'),
+  kappa_alpha_theta: require('../assets/badges/kappa_alpha_theta.png'),
+  kappa_delta: require('../assets/badges/kappa_delta.png'),
+  kappa_delta_rho: require('../assets/badges/kappa_delta_rho.png'),
+  kappa_kappa_gamma: require('../assets/badges/kappa_kappa_gamma.png'),
+  kappa_phi_lambda: require('../assets/badges/kappa_phi_lambda.png'),
+  kappa_sigma: require('../assets/badges/kappa_sigma.png'),
+  la_unidad_latina_lambda: require('../assets/badges/la_unidad_latina_lambda.png'),
+  lacrosse: require('../assets/badges/lacrosse.png'),
+  lambda_chi_alpha: require('../assets/badges/lambda_chi_alpha.png'),
+  lambda_phi_epsilon_international: require('../assets/badges/lambda_phi_epsilon_international.png'),
+  latin_at_brown: require('../assets/badges/latin_at_brown.png'),
+  malik: require('../assets/badges/malik.png'),
+  phi_beta_phi: require('../assets/badges/phi_beta_phi.png'),
+  phi_beta_sigma: require('../assets/badges/phi_beta_sigma.png'),
+  phi_delta_theta: require('../assets/badges/phi_delta_theta.png'),
+  phi_kappa_tau: require('../assets/badges/phi_kappa_tau.png'),
+  phi_mu: require('../assets/badges/phi_mu.png'),
+  phi_sigma_kappa: require('../assets/badges/phi_sigma_kappa.png'),
+  phi_sigma_sigma: require('../assets/badges/phi_sigma_sigma.png'),
+  pi_delta_psi: require('../assets/badges/pi_delta_psi.png'),
+  pi_kappa_alpha: require('../assets/badges/pi_kappa_alpha.png'),
+  pi_kappa_phi: require('../assets/badges/pi_kappa_phi.png'),
+  polo: require('../assets/badges/polo.png'),
+  rowing: require('../assets/badges/rowing.png'),
+  sailing: require('../assets/badges/sailing.png'),
+  sigma_alpha_mu: require('../assets/badges/sigma_alpha_mu.png'),
+  sigma_chi: require('../assets/badges/sigma_chi.png'),
+  sigma_delta_tau: require('../assets/badges/sigma_delta_tau.png'),
+  sigma_phi_society: require('../assets/badges/sigma_phi_society.png'),
+  sigma_pi: require('../assets/badges/sigma_pi.png'),
+  soccer: require('../assets/badges/soccer.png'),
+  softball: require('../assets/badges/softball.png'),
+  squash: require('../assets/badges/squash.png'),
+  swimming_and_diving: require('../assets/badges/swimming_and_diving.png'),
+  tap: require('../assets/badges/tap.png'),
+  tennis: require('../assets/badges/tennis.png'),
+  theta_alpha: require('../assets/badges/theta_alpha.png'),
+  theta_delta_chi: require('../assets/badges/theta_delta_chi.png'),
+  track: require('../assets/badges/track.png'),
+  track_and_field: require('../assets/badges/track_and_field.png'),
+  ucs: require('../assets/badges/ucs.png'),
+  volleyball: require('../assets/badges/volleyball.png'),
+  women_in_business: require('../assets/badges/women_in_business.png'),
+  wrestling: require('../assets/badges/wrestling.png'),
+  zeta_beta_tau: require('../assets/badges/zeta_beta_tau.png'),
+  zeta_delta_xi: require('../assets/badges/zeta_delta_xi.png'),
+  zeta_phi_beta: require('../assets/badges/zeta_phi_beta.png'),
+  zeta_psi: require('../assets/badges/zeta_psi.png'),
 };
 
-export const _cornellBadgeImages = {
-  acacia: require('../assets/badges/cornell/acacia.png'),
-  acapella: require('../assets/badges/cornell/acapella.png'),
-  aeta_phi_beta: require('../assets/badges/cornell/aeta_phi_beta.png'),
-  alpha_chi_omega: require('../assets/badges/cornell/alpha_chi_omega.png'),
-  alpha_delta_phi: require('../assets/badges/cornell/alpha_delta_phi.png'),
-  alpha_epsilon_phi: require('../assets/badges/cornell/alpha_epsilon_phi.png'),
-  alpha_gamma_rho: require('../assets/badges/cornell/alpha_gamma_rho.png'),
-  alpha_kappa_delta_phi: require('../assets/badges/cornell/alpha_kappa_delta_phi.png'),
-  alpha_phi_alpha: require('../assets/badges/cornell/alpha_phi_alpha.png'),
-  alpha_phi: require('../assets/badges/cornell/alpha_phi.png'),
-  alpha_sigma_phi: require('../assets/badges/cornell/alpha_sigma_phi.png'),
-  alpha_xi_delta: require('../assets/badges/cornell/alpha_xi_delta.png'),
-  alpha_zeta: require('../assets/badges/cornell/alpha_zeta.png'),
-  alphs_epsilon_pi: require('../assets/badges/cornell/alphs_epsilon_pi.png'),
-  baseball: require('../assets/badges/cornell/baseball.png'),
-  basketball: require('../assets/badges/cornell/basketball.png'),
-  beta_theta_pi: require('../assets/badges/cornell/beta_theta_pi.png'),
-  chi_phi: require('../assets/badges/cornell/chi_phi.png'),
-  chi_psi: require('../assets/badges/cornell/chi_psi.png'),
-  delta_chi: require('../assets/badges/cornell/delta_chi.png'),
-  delta_delta_delta: require('../assets/badges/cornell/delta_delta_delta.png'),
-  delta_epsilon: require('../assets/badges/cornell/delta_epsilon.png'),
-  delta_gamma: require('../assets/badges/cornell/delta_gamma.png'),
-  delta_kappa_epsilon: require('../assets/badges/cornell/delta_kappa_epsilon.png'),
-  delta_sigma_theta: require('../assets/badges/cornell/delta_sigma_theta.png'),
-  delta_tau_delta: require('../assets/badges/cornell/delta_tau_delta.png'),
-  fencing: require('../assets/badges/cornell/fencing.png'),
-  field_hockey: require('../assets/badges/cornell/field_hockey.png'),
-  football: require('../assets/badges/cornell/football.png'),
-  golf: require('../assets/badges/cornell/golf.png'),
-  gymnastics: require('../assets/badges/cornell/gymnastics.png'),
-  hockey: require('../assets/badges/cornell/hockey.png'),
-  kappa_alpha_theta: require('../assets/badges/cornell/kappa_alpha_theta.png'),
-  kappa_delta_rho: require('../assets/badges/cornell/kappa_delta_rho.png'),
-  kappa_delta: require('../assets/badges/cornell/kappa_delta.png'),
-  kappa_kappa_gamma: require('../assets/badges/cornell/kappa_kappa_gamma.png'),
-  kappa_phi_lambda: require('../assets/badges/cornell/kappa_phi_lambda.png'),
-  kappa_sigma: require('../assets/badges/cornell/kappa_sigma.png'),
-  la_unidad_latina_lambda: require('../assets/badges/cornell/la_unidad_latina,_lambda.png'),
-  lacrosse: require('../assets/badges/cornell/lacrosse.png'),
-  lambda_chi_alpha: require('../assets/badges/cornell/lambda_chi_alpha.png'),
-  lambda_phi_epsilon_international: require('../assets/badges/cornell/lambda_phi_epsilon_international.png'),
-  malik: require('../assets/badges/cornell/malik.png'),
-  phi_beta_phi: require('../assets/badges/cornell/phi_beta_phi.png'),
-  phi_beta_sigma: require('../assets/badges/cornell/phi_beta_sigma.png'),
-  phi_delta_theta: require('../assets/badges/cornell/phi_delta_theta.png'),
-  phi_kappa_tau: require('../assets/badges/cornell/phi_kappa_tau.png'),
-  phi_mu: require('../assets/badges/cornell/phi_mu.png'),
-  phi_sigma_kappa: require('../assets/badges/cornell/phi_sigma_kappa.png'),
-  phi_sigma_sigma: require('../assets/badges/cornell/phi_sigma_sigma.png'),
-  pi_delta_psi: require('../assets/badges/cornell/pi_delta_psi.png'),
-  pi_kappa_alpha: require('../assets/badges/cornell/pi_kappa_alpha.png'),
-  pi_kappa_phi: require('../assets/badges/cornell/pi_kappa_phi.png'),
-  polo: require('../assets/badges/cornell/polo.png'),
-  rowing: require('../assets/badges/cornell/rowing.png'),
-  sailing: require('../assets/badges/cornell/sailing.png'),
-  sigma_alpha_mu: require('../assets/badges/cornell/sigma_alpha_mu.png'),
-  sigma_chi: require('../assets/badges/cornell/sigma_chi.png'),
-  sigma_delta_tau: require('../assets/badges/cornell/sigma_delta_tau.png'),
-  sigma_phi_society: require('../assets/badges/cornell/sigma_phi_society.png'),
-  sigma_pi: require('../assets/badges/cornell/sigma_pi.png'),
-  soccer: require('../assets/badges/cornell/soccer.png'),
-  softball: require('../assets/badges/cornell/softball.png'),
-  squash: require('../assets/badges/cornell/squash.png'),
-  swimming_and_diving: require('../assets/badges/cornell/swimming_&_diving.png'),
-  tennis: require('../assets/badges/cornell/tennis.png'),
-  theta_delta_chi: require('../assets/badges/cornell/theta_delta_chi.png'),
-  track_and_field: require('../assets/badges/cornell/track_&_field.png'),
-  volleyball: require('../assets/badges/cornell/volleyball.png'),
-  wrestling: require('../assets/badges/cornell/wrestling.png'),
-  zeta_beta_tau: require('../assets/badges/cornell/zeta_beta_tau.png'),
-  zeta_psi: require('../assets/badges/cornell/zeta_psi.png'),
-  zeta_phi_beta: require('../assets/badges/cornell/zeta_phi_beta.png'),
-};
-
-const _brownBadges = [
+const _brownUniversityBadges = [
   {
     title: 'Athletics',
     data: [
       {
-        badgeName: 'Brown Football',
-        badgeImage: _brownBadgeImages.football,
+        badgeName: 'Football',
+        badgeImage: _badgeImages.football,
       },
       {
-        badgeName: 'Brown Track',
-        badgeImage: _brownBadgeImages.track,
+        badgeName: 'Track',
+        badgeImage: _badgeImages.track,
       },
       {
-        badgeName: 'Brown Soccer',
-        badgeImage: _brownBadgeImages.soccer,
+        badgeName: 'Soccer',
+        badgeImage: _badgeImages.soccer,
       },
       {
-        badgeName: 'Brown Volleyball',
-        badgeImage: _brownBadgeImages.volleyball,
+        badgeName: 'Volleyball',
+        badgeImage: _badgeImages.volleyball,
       },
       {
-        badgeName: 'Brown Lacrosse',
-        badgeImage: _brownBadgeImages.lacrosse,
+        badgeName: 'Lacrosse',
+        badgeImage: _badgeImages.lacrosse,
       },
       {
-        badgeName: 'Brown Basketball',
-        badgeImage: _brownBadgeImages.basketball,
+        badgeName: 'Basketball',
+        badgeImage: _badgeImages.basketball,
       },
       {
-        badgeName: 'Brown Field Hockey',
-        badgeImage: _brownBadgeImages.field_hockey,
+        badgeName: 'Field Hockey',
+        badgeImage: _badgeImages.field_hockey,
       },
       {
-        badgeName: 'Brown Gymnastics',
-        badgeImage: _brownBadgeImages.gymnastics,
+        badgeName: 'Gymnastics',
+        badgeImage: _badgeImages.gymnastics,
       },
       {
-        badgeName: 'Brown Tennis',
-        badgeImage: _brownBadgeImages.tennis,
+        badgeName: 'Tennis',
+        badgeImage: _badgeImages.tennis,
       },
       {
-        badgeName: 'Brown Hockey',
-        badgeImage: _brownBadgeImages.hockey,
+        badgeName: 'Hockey',
+        badgeImage: _badgeImages.hockey,
       },
       {
-        badgeName: 'Brown Softball',
-        badgeImage: _brownBadgeImages.softball,
+        badgeName: 'Softball',
+        badgeImage: _badgeImages.softball,
       },
       {
-        badgeName: 'Brown Baseball',
-        badgeImage: _brownBadgeImages.baseball,
-      },
-      {
-        badgeName: 'Brown Sailing',
-        badgeImage: _brownBadgeImages.sailing,
+        badgeName: 'Baseball',
+        badgeImage: _badgeImages.baseball,
       },
     ],
   },
-
   {
     title: 'Student Leadership',
     data: [
       {
         badgeName: 'Brown Class Board',
-        badgeImage: _brownBadgeImages.brown_class_board,
+        badgeImage: _badgeImages.brown_class_board,
       },
       {
         badgeName: 'UCS',
-        badgeImage: _brownBadgeImages.ucs,
+        badgeImage: _badgeImages.ucs,
       },
     ],
   },
@@ -194,62 +165,61 @@ const _brownBadges = [
     data: [
       {
         badgeName: 'Latin @ Brown',
-        badgeImage: _brownBadgeImages.latin_at_brown,
+        badgeImage: _badgeImages.latin_at_brown,
       },
       {
         badgeName: 'Buxton/International',
-        badgeImage: _brownBadgeImages.buxton_international,
+        badgeImage: _badgeImages.buxton_international,
       },
       {
         badgeName: 'BSU',
-        badgeImage: _brownBadgeImages.bsu,
+        badgeImage: _badgeImages.bsu,
       },
     ],
   },
   {
-    title: 'Sorority',
+    title: 'Sororities',
     data: [
       {
         badgeName: 'Kappa Delta',
-        badgeImage: _brownBadgeImages.kappa_delta,
+        badgeImage: _badgeImages.kappa_delta,
       },
       {
         badgeName: "Brown Women's Collective",
-        badgeImage: _brownBadgeImages.brown_womens_collective,
+        badgeImage: _badgeImages.brown_womens_collective,
       },
       {
         badgeName: 'Alpha Delta Phi',
-        badgeImage: _brownBadgeImages.alpha_delta_phi,
+        badgeImage: _badgeImages.alpha_delta_phi,
       },
       {
         badgeName: 'Alpha Chi Omega',
-        badgeImage: _brownBadgeImages.alpha_chi_omega,
+        badgeImage: _badgeImages.alpha_chi_omega,
       },
       {
         badgeName: 'Delta Gamma',
-        badgeImage: _brownBadgeImages.delta_gamma,
+        badgeImage: _badgeImages.delta_gamma,
       },
     ],
   },
-
   {
-    title: 'Fraternity',
+    title: 'Fraternities',
     data: [
       {
         badgeName: 'Beta Rho Pi',
-        badgeImage: _brownBadgeImages.beta_rho_pi,
+        badgeImage: _badgeImages.beta_rho_pi,
       },
       {
         badgeName: 'Delta Tau',
-        badgeImage: _brownBadgeImages.delta_tau,
+        badgeImage: _badgeImages.delta_tau,
       },
       {
         badgeName: 'Theta Alpha',
-        badgeImage: _brownBadgeImages.theta_alpha,
+        badgeImage: _badgeImages.theta_alpha,
       },
       {
         badgeName: 'Zeta Delta Xi',
-        badgeImage: _brownBadgeImages.zeta_delta_xi,
+        badgeImage: _badgeImages.zeta_delta_xi,
       },
     ],
   },
@@ -258,23 +228,19 @@ const _brownBadges = [
     data: [
       {
         badgeName: 'Acapella',
-        badgeImage: _brownBadgeImages.acapella,
+        badgeImage: _badgeImages.acapella,
       },
       {
         badgeName: 'Taps',
-        badgeImage: _brownBadgeImages.tap,
+        badgeImage: _badgeImages.tap,
       },
       {
-        badgeName: 'Fashion @ Brown',
-        badgeImage: _brownBadgeImages.fashion_at_brown,
+        badgeName: 'Fashion @ brown',
+        badgeImage: _badgeImages.fashion_at_brown,
       },
       {
         badgeName: 'Impulse',
-        badgeImage: _brownBadgeImages.impulse,
-      },
-      {
-        badgeName: 'Ivy Film Festival',
-        badgeImage: _brownBadgeImages.iff,
+        badgeImage: _badgeImages.impulse_and_mezcla,
       },
     ],
   },
@@ -283,164 +249,216 @@ const _brownBadges = [
     data: [
       {
         badgeName: 'Brown EP',
-        badgeImage: _brownBadgeImages.brown_ep,
+        badgeImage: _badgeImages.brown_enrepreneurship,
       },
       {
-        badgeName: 'Black in Business',
-        badgeImage: _brownBadgeImages.black_in_business,
+        badgeName: 'Black in business',
+        badgeImage: _badgeImages.black_in_business,
       },
       {
-        badgeName: 'Women in Business',
-        badgeImage: _brownBadgeImages.women_in_business,
+        badgeName: 'Women in business',
+        badgeImage: _badgeImages.women_in_business,
       },
       {
         badgeName: 'Brown CS',
-        badgeImage: _brownBadgeImages.brown_cs,
+        badgeImage: _badgeImages.brown_cs,
       },
     ],
   },
 ];
 
-const _cornellBadges = [
+const _cornellUniversityBadges = [
   {
-    title: 'Athletics',
+    title: 'Acapella',
     data: [
-      {badgeName: 'Football', badgeImage: _cornellBadgeImages.football},
       {
-        badgeName: 'Track & Field',
-        badgeImage: _cornellBadgeImages.track_and_field,
-      },
-      {badgeName: 'Soccer', badgeImage: _cornellBadgeImages.soccer},
-      {badgeName: 'Volleyball', badgeImage: _cornellBadgeImages.volleyball},
-      {badgeName: 'Lacrosse', badgeImage: _cornellBadgeImages.lacrosse},
-      {badgeName: 'Basketball', badgeImage: _cornellBadgeImages.basketball},
-      {
-        badgeName: 'Field hockey',
-        badgeImage: _cornellBadgeImages.field_hockey,
-      },
-      {badgeName: 'Gymnastics', badgeImage: _cornellBadgeImages.gymnastics},
-      {badgeName: 'Tennis', badgeImage: _cornellBadgeImages.tennis},
-      {badgeName: 'Hockey', badgeImage: _cornellBadgeImages.hockey},
-      {badgeName: 'Softball', badgeImage: _cornellBadgeImages.softball},
-      {badgeName: 'Baseball', badgeImage: _cornellBadgeImages.baseball},
-      {badgeName: 'Sailing', badgeImage: _cornellBadgeImages.sailing},
-      {badgeName: 'Golf', badgeImage: _cornellBadgeImages.golf},
-      {badgeName: 'Wrestling', badgeImage: _cornellBadgeImages.wrestling},
-      {badgeName: 'Squash', badgeImage: _cornellBadgeImages.squash},
-      {badgeName: 'Rowing', badgeImage: _cornellBadgeImages.rowing},
-      {badgeName: 'Polo', badgeImage: _cornellBadgeImages.polo},
+        badgeName: 'Absolute',
+        badgeImage: _badgeImages.acapella,
+      },
       {
-        badgeName: 'Swimming & Diving',
-        badgeImage: _cornellBadgeImages.swimming_and_diving,
+        badgeName: 'After Eight',
+        badgeImage: _badgeImages.acapella,
+      },
+      {
+        badgeName: 'Last Call',
+        badgeImage: _badgeImages.acapella,
+      },
+      {
+        badgeName: 'Less Than Three',
+        badgeImage: _badgeImages.acapella,
+      },
+      {
+        badgeName: 'Measureless',
+        badgeImage: _badgeImages.acapella,
+      },
+      {
+        badgeName: 'Tarana',
+        badgeImage: _badgeImages.acapella,
+      },
+      {
+        badgeName: 'The Callbaxx',
+        badgeImage: _badgeImages.acapella,
+      },
+      {
+        badgeName: 'The Chai Notes',
+        badgeImage: _badgeImages.acapella,
+      },
+      {
+        badgeName: 'The Chordials',
+        badgeImage: _badgeImages.acapella,
+      },
+      {
+        badgeName: 'The Hangovers',
+        badgeImage: _badgeImages.acapella,
+      },
+      {
+        badgeName: 'The Key Elements',
+        badgeImage: _badgeImages.acapella,
+      },
+      {
+        badgeName: 'The Touchtones',
+        badgeImage: _badgeImages.acapella,
       },
-      {badgeName: 'Fencing', badgeImage: _cornellBadgeImages.fencing},
     ],
   },
   {
     title: 'Fraternities',
     data: [
-      {badgeName: 'Acacia', badgeImage: _cornellBadgeImages.acacia},
+      {
+        badgeName: 'Acacia',
+        badgeImage: _badgeImages.acacia,
+      },
       {
         badgeName: 'Alpha Delta Phi',
-        badgeImage: _cornellBadgeImages.alpha_delta_phi,
+        badgeImage: _badgeImages.alpha_delta_phi,
       },
       {
         badgeName: 'Alpha Epsilon Pi',
-        badgeImage: _cornellBadgeImages.alpha_epsilon_phi,
+        badgeImage: _badgeImages.alpha_epsilon_pi,
       },
       {
         badgeName: 'Alpha Gamma Rho',
-        badgeImage: _cornellBadgeImages.alpha_gamma_rho,
+        badgeImage: _badgeImages.alpha_gamma_rho,
+      },
+      {
+        badgeName: 'Alpha Phi Alpha',
+        badgeImage: _badgeImages.alpha_phi_alpha,
       },
       {
         badgeName: 'Alpha Sigma Phi',
-        badgeImage: _cornellBadgeImages.alpha_sigma_phi,
+        badgeImage: _badgeImages.alpha_sigma_phi,
+      },
+      {
+        badgeName: 'Alpha Zeta',
+        badgeImage: _badgeImages.alpha_zeta,
       },
-      {badgeName: 'Alpha Zeta', badgeImage: _cornellBadgeImages.alpha_zeta},
       {
         badgeName: 'Beta Theta Pi',
-        badgeImage: _cornellBadgeImages.beta_theta_pi,
+        badgeImage: _badgeImages.beta_theta_pi,
+      },
+      {
+        badgeName: 'Chi Phi',
+        badgeImage: _badgeImages.chi_phi,
+      },
+      {
+        badgeName: 'Chi Psi',
+        badgeImage: _badgeImages.chi_psi,
+      },
+      {
+        badgeName: 'Delta Chi',
+        badgeImage: _badgeImages.delta_chi,
       },
-      {badgeName: 'Chi Phi', badgeImage: _cornellBadgeImages.chi_phi},
-      {badgeName: 'Chi Psi', badgeImage: _cornellBadgeImages.chi_psi},
-      {badgeName: 'Delta Chi', badgeImage: _cornellBadgeImages.delta_chi},
       {
         badgeName: 'Delta Kappa Epsilon',
-        badgeImage: _cornellBadgeImages.delta_kappa_epsilon,
+        badgeImage: _badgeImages.delta_kappa_epsilon,
       },
       {
         badgeName: 'Delta Tau Delta',
-        badgeImage: _cornellBadgeImages.delta_tau_delta,
+        badgeImage: _badgeImages.delta_tau_delta,
       },
       {
-        badgeName: 'Delta Epsilon',
-        badgeImage: _cornellBadgeImages.delta_epsilon,
+        badgeName: 'Delta Upsilon',
+        badgeImage: _badgeImages.delta_upsilon,
       },
       {
         badgeName: 'Kappa Delta Rho',
-        badgeImage: _cornellBadgeImages.kappa_delta_rho,
+        badgeImage: _badgeImages.kappa_delta_rho,
+      },
+      {
+        badgeName: 'Kappa Sigma',
+        badgeImage: _badgeImages.kappa_sigma,
+      },
+      {
+        badgeName: 'La Unidad Latina, Lambda',
+        badgeImage: _badgeImages.la_unidad_latina_lambda,
       },
-      {badgeName: 'Kappa Sigma', badgeImage: _cornellBadgeImages.kappa_sigma},
       {
         badgeName: 'Lambda Chi Alpha',
-        badgeImage: _cornellBadgeImages.lambda_chi_alpha,
+        badgeImage: _badgeImages.lambda_chi_alpha,
+      },
+      {
+        badgeName: 'Lambda Phi Epsilon International',
+        badgeImage: _badgeImages.lambda_phi_epsilon_international,
+      },
+      {
+        badgeName: 'MALIK',
+        badgeImage: _badgeImages.malik,
+      },
+      {
+        badgeName: 'Phi Beta Sigma',
+        badgeImage: _badgeImages.phi_beta_sigma,
       },
       {
         badgeName: 'Phi Delta Theta',
-        badgeImage: _cornellBadgeImages.phi_delta_theta,
+        badgeImage: _badgeImages.phi_delta_theta,
       },
       {
         badgeName: 'Phi Kappa Tau',
-        badgeImage: _cornellBadgeImages.phi_kappa_tau,
+        badgeImage: _badgeImages.phi_kappa_tau,
       },
       {
         badgeName: 'Phi Sigma Kappa',
-        badgeImage: _cornellBadgeImages.phi_sigma_kappa,
+        badgeImage: _badgeImages.phi_sigma_kappa,
       },
       {
-        badgeName: 'Pi Kappa Alpha',
-        badgeImage: _cornellBadgeImages.pi_kappa_alpha,
+        badgeName: 'Pi Delta Psi',
+        badgeImage: _badgeImages.pi_delta_psi,
       },
-      {badgeName: 'Pi Kappa Phi', badgeImage: _cornellBadgeImages.pi_kappa_phi},
       {
-        badgeName: 'Sigma Alpha Mu',
-        badgeImage: _cornellBadgeImages.sigma_alpha_mu,
+        badgeName: 'Pi Kappa Alpha',
+        badgeImage: _badgeImages.pi_kappa_alpha,
       },
-      {badgeName: 'Sigma Chi', badgeImage: _cornellBadgeImages.sigma_chi},
       {
-        badgeName: 'Sigma Phi Society',
-        badgeImage: _cornellBadgeImages.sigma_phi_society,
+        badgeName: 'Pi Kappa Phi',
+        badgeImage: _badgeImages.pi_kappa_phi,
       },
-      {badgeName: 'Sigma Pi', badgeImage: _cornellBadgeImages.sigma_pi},
       {
-        badgeName: 'Theta Delta Chi',
-        badgeImage: _cornellBadgeImages.theta_delta_chi,
+        badgeName: 'Sigma Alpha Mu',
+        badgeImage: _badgeImages.sigma_alpha_mu,
       },
       {
-        badgeName: 'Zeta Beta Tau',
-        badgeImage: _cornellBadgeImages.zeta_beta_tau,
+        badgeName: 'Sigma Chi',
+        badgeImage: _badgeImages.sigma_chi,
       },
-      {badgeName: 'Zeta Psi', badgeImage: _cornellBadgeImages.zeta_psi},
       {
-        badgeName: 'Alpha Phi Alpha',
-        badgeImage: _cornellBadgeImages.alpha_phi_alpha,
+        badgeName: 'Sigma Phi Society',
+        badgeImage: _badgeImages.sigma_phi_society,
       },
       {
-        badgeName: 'Lambda Phi Epsilon International',
-        badgeImage: _cornellBadgeImages.lambda_phi_epsilon_international,
+        badgeName: 'Sigma Pi',
+        badgeImage: _badgeImages.sigma_pi,
       },
       {
-        badgeName: 'La Unidad Latina, Lambda',
-        badgeImage: _cornellBadgeImages.la_unidad_latina_lambda,
+        badgeName: 'Theta Delta Chi',
+        badgeImage: _badgeImages.theta_delta_chi,
       },
-      {badgeName: 'Malik', badgeImage: _cornellBadgeImages.malik},
       {
-        badgeName: 'Phi Beta Sigma',
-        badgeImage: _cornellBadgeImages.phi_beta_sigma,
+        badgeName: 'Zeta Beta Tau',
+        badgeImage: _badgeImages.zeta_beta_tau,
       },
       {
-        badgeName: 'Pi Delta Psi',
-        badgeImage: _cornellBadgeImages.pi_delta_psi,
+        badgeName: 'Zeta Psi',
+        badgeImage: _badgeImages.zeta_psi,
       },
     ],
   },
@@ -448,64 +466,164 @@ const _cornellBadges = [
     title: 'Sororities',
     data: [
       {
-        badgeName: 'Alpha Kappa Delta Phi',
-        badgeImage: _cornellBadgeImages.alpha_kappa_delta_phi,
+        badgeName: 'Alpha Chi Omega',
+        badgeImage: _badgeImages.alpha_chi_omega,
       },
       {
-        badgeName: 'Delta Sigma Theta',
-        badgeImage: _cornellBadgeImages.delta_sigma_theta,
+        badgeName: 'Alpha Epsilon Phi',
+        badgeImage: _badgeImages.alpha_epsilon_phi,
       },
       {
-        badgeName: 'Kappa Phi Lambda',
-        badgeImage: _cornellBadgeImages.kappa_phi_lambda,
+        badgeName: 'Alpha Kappa Delta Phi',
+        badgeImage: _badgeImages.alpha_kappa_delta_phi,
       },
       {
-        badgeName: 'Zeta Phi Beta',
-        badgeImage: _cornellBadgeImages.zeta_phi_beta,
+        badgeName: 'Alpha Phi',
+        badgeImage: _badgeImages.alpha_phi,
       },
       {
-        badgeName: 'Alpha Chi Omega',
-        badgeImage: _cornellBadgeImages.alpha_chi_omega,
+        badgeName: 'Alpha Xi Delta',
+        badgeImage: _badgeImages.alpha_xi_delta,
       },
       {
-        badgeName: 'Alpha Epsilon Phi',
-        badgeImage: _cornellBadgeImages.alpha_epsilon_phi,
+        badgeName: 'Delta Delta Delta',
+        badgeImage: _badgeImages.delta_delta_delta,
       },
-      {badgeName: 'Alpha Phi', badgeImage: _cornellBadgeImages.alpha_phi},
       {
-        badgeName: 'Alpha Xi Delta',
-        badgeImage: _cornellBadgeImages.alpha_xi_delta,
+        badgeName: 'Delta Gamma',
+        badgeImage: _badgeImages.delta_gamma,
       },
       {
-        badgeName: 'Delta Delta Delta',
-        badgeImage: _cornellBadgeImages.delta_delta_delta,
+        badgeName: 'Delta Sigma Theta',
+        badgeImage: _badgeImages.delta_sigma_theta,
       },
-      {badgeName: 'Delta Gamma', badgeImage: _cornellBadgeImages.delta_gamma},
       {
         badgeName: 'Kappa Alpha Theta',
-        badgeImage: _cornellBadgeImages.kappa_alpha_theta,
+        badgeImage: _badgeImages.kappa_alpha_theta,
+      },
+      {
+        badgeName: 'Kappa Delta',
+        badgeImage: _badgeImages.kappa_delta,
       },
-      {badgeName: 'Kappa Delta', badgeImage: _cornellBadgeImages.kappa_delta},
       {
         badgeName: 'Kappa Kappa Gamma',
-        badgeImage: _cornellBadgeImages.kappa_kappa_gamma,
+        badgeImage: _badgeImages.kappa_kappa_gamma,
+      },
+      {
+        badgeName: 'Kappa Phi Lambda',
+        badgeImage: _badgeImages.kappa_phi_lambda,
+      },
+      {
+        badgeName: 'Phi Beta Phi',
+        badgeImage: _badgeImages.phi_beta_phi,
+      },
+      {
+        badgeName: 'Phi Mu',
+        badgeImage: _badgeImages.phi_mu,
       },
-      {badgeName: 'Phi Mu', badgeImage: _cornellBadgeImages.phi_mu},
       {
         badgeName: 'Phi Sigma Sigma',
-        badgeImage: _cornellBadgeImages.phi_sigma_sigma,
+        badgeImage: _badgeImages.phi_sigma_sigma,
       },
-      {badgeName: 'Phi Beta Phi', badgeImage: _cornellBadgeImages.phi_beta_phi},
       {
         badgeName: 'Sigma Delta Tau',
-        badgeImage: _cornellBadgeImages.sigma_delta_tau,
+        badgeImage: _badgeImages.sigma_delta_tau,
+      },
+      {
+        badgeName: 'Zeta Phi Beta',
+        badgeImage: _badgeImages.zeta_phi_beta,
+      },
+    ],
+  },
+  {
+    title: 'Athletics',
+    data: [
+      {
+        badgeName: 'Baseball',
+        badgeImage: _badgeImages.baseball,
+      },
+      {
+        badgeName: 'Basketball',
+        badgeImage: _badgeImages.basketball,
+      },
+      {
+        badgeName: 'Fencing',
+        badgeImage: _badgeImages.fencing,
+      },
+      {
+        badgeName: 'Field Hockey',
+        badgeImage: _badgeImages.field_hockey,
+      },
+      {
+        badgeName: 'Football',
+        badgeImage: _badgeImages.football,
+      },
+      {
+        badgeName: 'Golf',
+        badgeImage: _badgeImages.golf,
+      },
+      {
+        badgeName: 'Gymnastics',
+        badgeImage: _badgeImages.gymnastics,
+      },
+      {
+        badgeName: 'Hockey',
+        badgeImage: _badgeImages.hockey,
+      },
+      {
+        badgeName: 'Lacrosse',
+        badgeImage: _badgeImages.lacrosse,
+      },
+      {
+        badgeName: 'Polo',
+        badgeImage: _badgeImages.polo,
+      },
+      {
+        badgeName: 'Rowing',
+        badgeImage: _badgeImages.rowing,
+      },
+      {
+        badgeName: 'Sailing',
+        badgeImage: _badgeImages.sailing,
+      },
+      {
+        badgeName: 'Soccer',
+        badgeImage: _badgeImages.soccer,
+      },
+      {
+        badgeName: 'Softball',
+        badgeImage: _badgeImages.softball,
+      },
+      {
+        badgeName: 'Squash',
+        badgeImage: _badgeImages.squash,
+      },
+      {
+        badgeName: 'Swimming & Diving',
+        badgeImage: _badgeImages.swimming_and_diving,
+      },
+      {
+        badgeName: 'Tennis',
+        badgeImage: _badgeImages.tennis,
+      },
+      {
+        badgeName: 'Track & Field',
+        badgeImage: _badgeImages.track_and_field,
+      },
+      {
+        badgeName: 'Volleyball',
+        badgeImage: _badgeImages.volleyball,
+      },
+      {
+        badgeName: 'Wrestling',
+        badgeImage: _badgeImages.wrestling,
       },
     ],
   },
 ];
 
 export const BADGE_DATA: BadgeDataType = {
-  'Brown University': _brownBadges,
-  'Cornell University': _cornellBadges,
+  'Brown University': _brownUniversityBadges,
+  'Cornell University': _cornellUniversityBadges,
   '': [],
 };
diff --git a/yarn.lock b/yarn.lock
index 2e9f711a..ce906f2f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1039,6 +1039,11 @@
   resolved "https://registry.yarnpkg.com/@react-native-community/netinfo/-/netinfo-6.0.0.tgz#2a4d7190b508dd0c2293656c9c1aa068f6f60a71"
   integrity sha512-Z9M8VGcF2IZVOo2x+oUStvpCW/8HjIRi4+iQCu5n+PhC7OqCQX58KYAzdBr///alIfRXiu6oMb+lK+rXQH1FvQ==
 
+"@react-native-firebase/analytics@^11.2.0":
+  version "11.2.0"
+  resolved "https://registry.yarnpkg.com/@react-native-firebase/analytics/-/analytics-11.2.0.tgz#f94dd039539a41507e222d5deb4777934c0b0305"
+  integrity sha512-/vCywT0i+E2xPLq5LADcYF07f1yn52zRBIbiR3W54837Izx/7ns3Sg6AXIz1CEUf1nrUmZqTLK6QAGrZZDwPLg==
+
 "@react-native-firebase/app@^10.0.0":
   version "10.8.1"
   resolved "https://registry.yarnpkg.com/@react-native-firebase/app/-/app-10.8.1.tgz#3455f491a5fc3d91677fd69e70b006a68fb7ca5c"