diff --git a/pages/index.js b/pages/index.js
index 884c384..de0228d 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -14,7 +14,7 @@
         name="Clicks Minute Per"
         subtext="Custom Made Programs"
         gradient={["6576CC", "4B5899"]}
-        wave="Main"
+        wave="web/waves/header/cmp"
         buttons={[]}
       />
       <p id="start" />
@@ -22,7 +22,8 @@
         <SectionHeading>Projects</SectionHeading>
         <CardRow>
           <Card
-            wave="GS" title="GPS" subtext="Cards Against Humanity on Discord"
+            wave="gps" title="GPS" subtext="Cards Against Humanity on Discord"
+            icon="bots/gps/normal"
             buttons={[
               {color: "6576CC", link: "https://discordapp.com/oauth2/authorize?client_id=679361555732627476&scope=bot&permissions=130048", text: "Invite"},
               {color: "6576CC", link: "/gps", text: "About"}
@@ -30,7 +31,8 @@
             buttonText={"FFFFFF"} gradient={["78ECF2", "71AFE5"]}
           />
           <Card
-            wave="RM" title="RSM" subtext="Moderation Redefined"
+            wave="rsm" title="RSM" subtext="Moderation Redefined"
+            icon="bots/rsm/normal"
             buttons={[
               {color: "424242", link: "https://discord.com/api/oauth2/authorize?client_id=715989276382462053&permissions=121295465718&scope=bot%20applications.commands",text:"Invite"},
               {color: "424242", link: "/rsm", text:"About"}
@@ -38,7 +40,8 @@
             buttonText={"FFFFFF"} gradient={["F27878", "D96B6B"]}
           />
           <Card
-            wave="CF" title="ClicksForms" subtext="Create custom forms for Discord"
+            wave="clicksforms" title="ClicksForms" subtext="Create custom forms for Discord"
+            icon="bots/clicksforms/normal"
             buttons={[
               {color: "775EBF", link: "https://clicksminuteper.github.io/docs/clicksforms", text:"API", newTab: true},
               {color: "775EBF", link: "https://discord.com/api/oauth2/authorize?client_id=805392054678192169&permissions=2416307200&scope=bot%20applications.commands",text:"Invite"},
@@ -47,14 +50,16 @@
             buttonText={"FFFFFF"} gradient={["71AFE5", "6576CC"]}
           />
           <Card
-            wave="CA" title="Castaway" subtext="Stranded on Discord"
+            wave="castaway" title="Castaway" subtext="Stranded on Discord"
+            icon="bots/castaway/normal"
             buttons={[
               {color: "F2D478", link: "/castaway", text: "About"}
             ]}
             buttonText={"000000"} gradient={["71AFE5", "78ECF2"]}
           />
           <Card
-            wave="HY" title="Hooky" subtext="Webhook protection for Discord"
+            wave="hooky" title="Hooky" subtext="Webhook protection for Discord"
+            icon="bots/hooky/normal"
             buttons={[
               {color: "EDC575", link: "https://discord.com/oauth2/authorize?client_id=752188923505279037&scope=bot&permissions=536882176", text: "Invite"},
               {color: "EDC575", link: "/hooky", text: "About"}
@@ -62,7 +67,8 @@
             buttonText={"000000"} gradient={["424242", "8D8D8D"]}
           />
           <Card
-            wave="CL" title="Clcks" subtext="Clicks Minute Per web apps"
+            wave="clcks" title="Clcks" subtext="Clicks Minute Per web apps"
+            icon="web/icons/clcks"
             buttons={[
               {color: "78ECF2", link: "https://clcks.dev", text: "View Apps"
             }]}
@@ -72,14 +78,16 @@
         <SectionHeading>Code Bases</SectionHeading>
         <CardRow>
           <Card
-            wave="GH" title="GitHub" subtext="View our open source projects"
+            wave="github" title="GitHub" subtext="View our open source projects"
+            icon="web/icons/github"
             buttons={[
               {color: "424242", link: "https://github.com/clicksminuteper", text: "Visit"}
             ]}
             buttonText={"FFFFFF"} gradient={["FFFFFF", "C4C4C4"]}
           />
           <Card
-            wave="PY" title="PyPi" subtext="View our modules for python"
+            wave="pypi" title="PyPi" subtext="View our modules for python"
+            icon="web/icons/pypi"
             buttons={[
               {color: "FFC91E", link: "https://pypi.org/user/ClicksMinutePer/", text: "Visit"}
             ]}
@@ -89,9 +97,10 @@
         <SectionHeading>Socials</SectionHeading>
         <CardRow>
           <Card
-            wave="DS" title="Discord" subtext="Join our Discord server to talk with the community"
+            wave="discord" title="Discord" subtext="Join our Discord server to talk with the community"
+            icon="web/icons/discord"
             buttons={[
-              {color: "424242", link: "https://discord.gg/bPaNnxe", text: "Join"}
+              {color: "404EED", link: "https://discord.gg/bPaNnxe", text: "Join"}
             ]}
             buttonText={"FFFFFF"} gradient={["404EED", "404EED"]}
           />