diff --git a/src/App.css b/src/App.css
index c9594cb..ed1e04a 100644
--- a/src/App.css
+++ b/src/App.css
@@ -1,7 +1,3 @@
-* {
-  border-radius: 16px;
-}
-
 body {
   background-color: aliceblue;
   position: relative;
@@ -46,6 +42,7 @@ footer {
 .controls {
   z-index: 9;
   position: absolute;
+  color: black;
   top: 1vh;
   right: 0px;
   padding: 8px;
@@ -133,7 +130,7 @@ input:checked+.slider:before {
 }
 
 .grey {
-  color: #444;
+  opacity: 66%;
 }
 
 
@@ -193,6 +190,7 @@ h3 {
 .box {
   position: relative;
   flex: 1;
+  border-radius: 16px;
 
   &.one {
     max-width: min(96%, 768px);
@@ -265,6 +263,7 @@ button {
 
 .control {
   display: flex;
+  border-radius: 16px;
   flex-direction: column;
   align-items: center;
   justify-content: center;
@@ -418,6 +417,7 @@ button {
   padding: 3px 8px;
   width: fit-content;
   border: 3px solid black;
+  border-radius: 16px;
   margin: 0 auto 16px auto;
 
   ul {
@@ -435,6 +435,31 @@ button {
   }
 }
 
+/*=======CONTEXT MENU=======*/
+.context-menu {
+  z-index: 3;
+  position: absolute;
+  background: aliceblue;
+  box-shadow: 4px 4px black;
+  color: black;
+  border: 3px solid black;
+  border-radius: 16px;
+  padding: 0;
+  margin: 0;
+  list-style: none;
+
+  li {
+    padding: 8px;
+    border-bottom: 2px solid #0008;
+    border-radius: 0;
+    cursor: pointer;
+  }
+
+  li:last-child {
+    border-bottom: none;
+  }
+}
+
 
 .networkroute {
   z-index: 3;
diff --git a/src/App.tsx b/src/App.tsx
index ae661aa..075d994 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -8,6 +8,7 @@ import { SessionProvider } from "./Session";
 import { GraphComponent } from "./Network";
 import MVPChart from "./MVPChart";
 import { SetPassword } from "./SetPassword";
+import { ThemeProvider } from "./ThemeProvider";
 
 const Maintenance = () => {
   return (
@@ -21,26 +22,28 @@ const Maintenance = () => {
 
 function App() {
   return (
-    <BrowserRouter>
-      <Routes>
-        <Route path="/password" element={<SetPassword />} />
-        <Route
-          path="/*"
-          element={
-            <SessionProvider>
-              <Header />
-              <Routes>
-                <Route index element={<Rankings />} />
-                <Route path="/network" element={<GraphComponent />} />
-                <Route path="/analysis" element={<Analysis />} />
-                <Route path="/mvp" element={<MVPChart />} />
-              </Routes>
-              <Footer />
-            </SessionProvider>
-          }
-        />
-      </Routes>
-    </BrowserRouter>
+    <ThemeProvider>
+      <BrowserRouter>
+        <Routes>
+          <Route path="/password" element={<SetPassword />} />
+          <Route
+            path="/*"
+            element={
+              <SessionProvider>
+                <Header />
+                <Routes>
+                  <Route index element={<Rankings />} />
+                  <Route path="/network" element={<GraphComponent />} />
+                  <Route path="/analysis" element={<Analysis />} />
+                  <Route path="/mvp" element={<MVPChart />} />
+                </Routes>
+                <Footer />
+              </SessionProvider>
+            }
+          />
+        </Routes>
+      </BrowserRouter>
+    </ThemeProvider>
   );
 }
 export default App;
diff --git a/src/Avatar.tsx b/src/Avatar.tsx
index a0aaafb..9cc95e2 100644
--- a/src/Avatar.tsx
+++ b/src/Avatar.tsx
@@ -1,6 +1,8 @@
 import { createRef, MouseEventHandler, useEffect, useState } from "react";
 import { useSession } from "./Session";
 import { User } from "./api";
+import { useTheme } from "./ThemeProvider";
+import { colourTheme, darkTheme, normalTheme, rainbowTheme } from "./themes";
 
 interface ContextMenuItem {
   label: string;
@@ -32,6 +34,7 @@ const UserInfo = (user: User) => {
 
 export default function Avatar() {
   const { user, onLogout } = useSession();
+  const { theme, setTheme } = useTheme();
   const [contextMenu, setContextMenu] = useState<{
     open: boolean;
     allowOpen: boolean;
@@ -42,8 +45,26 @@ export default function Avatar() {
   const avatarRef = createRef<HTMLDivElement>();
 
   const contextMenuItems: ContextMenuItem[] = [
-    { label: "View Profile", onClick: handleViewProfile },
-    { label: "Logout", onClick: onLogout },
+    { label: "view Profile", onClick: handleViewProfile },
+    {
+      label: "change theme",
+      onClick: () => {
+        switch (theme) {
+          case darkTheme:
+            setTheme(colourTheme);
+            break;
+          case colourTheme:
+            setTheme(rainbowTheme);
+            break;
+          case rainbowTheme:
+            setTheme(normalTheme);
+            break;
+          case normalTheme:
+            setTheme(darkTheme);
+        }
+      },
+    },
+    { label: "logout", onClick: onLogout },
   ];
 
   const handleMenuClick: MouseEventHandler<HTMLDivElement> = (event) => {
@@ -94,7 +115,6 @@ export default function Avatar() {
   const dialogRef = createRef<HTMLDialogElement>();
 
   function handleViewProfile() {
-    handleMenuClose();
     if (user) {
       dialogRef.current?.showModal();
       setDialog(UserInfo(user));
@@ -105,7 +125,7 @@ export default function Avatar() {
     <div
       className="avatar"
       onContextMenu={handleMenuClick}
-      style={{ display: user ? "block" : "none" }}
+      style={{ display: user ? "block" : "none", color: "black" }}
       onClick={(event) => {
         if (contextMenu.open && event.target === avatarRef.current) {
           handleMenuClose();
@@ -121,25 +141,13 @@ export default function Avatar() {
           className="context-menu"
           ref={contextMenuRef}
           style={{
-            zIndex: 3,
-            position: "absolute",
             top: contextMenu.mouseY,
             left: contextMenu.mouseX,
-            background: "white",
-            border: "1px solid #ddd",
-            padding: 0,
-            margin: 0,
-            listStyle: "none",
           }}
         >
           {contextMenuItems.map((item, index) => (
             <li
               key={index}
-              style={{
-                padding: "10px",
-                borderBottom: "1px solid #ddd",
-                cursor: "pointer",
-              }}
               onClick={() => {
                 item.onClick();
                 handleMenuClose();
diff --git a/src/NetworkTheme.tsx b/src/NetworkTheme.ts
similarity index 96%
rename from src/NetworkTheme.tsx
rename to src/NetworkTheme.ts
index 7fc342b..41520a9 100644
--- a/src/NetworkTheme.tsx
+++ b/src/NetworkTheme.ts
@@ -1,6 +1,6 @@
 import { Theme } from "reagraph";
 
-export const customTheme: Theme = {
+export var customTheme: Theme = {
   canvas: {
     background: "aliceblue",
   },
diff --git a/src/RaceChart.tsx b/src/RaceChart.tsx
index 227060f..4a81521 100644
--- a/src/RaceChart.tsx
+++ b/src/RaceChart.tsx
@@ -14,12 +14,10 @@ const determineNiceWidth = (width: number) => {
 };
 
 const RaceChart: FC<RaceChartProps> = ({ players, std }) => {
-  // State to store window's width and height
   const [width, setWidth] = useState(determineNiceWidth(window.innerWidth));
   //const [height, setHeight] = useState(window.innerHeight);
   const height = players.length * 40;
 
-  // Update state on  resize
   useEffect(() => {
     const handleResize = () => {
       setWidth(determineNiceWidth(window.innerWidth));
@@ -41,11 +39,14 @@ const RaceChart: FC<RaceChartProps> = ({ players, std }) => {
       {players.map((player, index) => (
         <rect
           key={String(index)}
-          x={0}
+          x={4}
           y={index * barHeight + padding}
           width={(1 - player.rank / maxValue) * width}
           height={barHeight - gap} // subtract 2 for some spacing between bars
           fill="#36c"
+          stroke="aliceblue"
+          strokeWidth={4}
+          paintOrder={"stroke fill"}
         />
       ))}
 
@@ -53,7 +54,7 @@ const RaceChart: FC<RaceChartProps> = ({ players, std }) => {
         <g key={"group" + index}>
           <text
             key={index + "_name"}
-            x={4}
+            x={8}
             y={index * barHeight + barHeight / 2 + padding + gap / 2}
             width={(1 - player.rank / maxValue) * width}
             height={barHeight - 8} // subtract 2 for some spacing between bars
@@ -71,7 +72,7 @@ const RaceChart: FC<RaceChartProps> = ({ players, std }) => {
           <text
             key={index + "_value"}
             x={
-              4 +
+              8 +
               (4 + Math.max(...players.map((p, _) => p.name.length))) *
                 fontSize *
                 0.66