diff --git a/app/assets/v2/css/activity_stream.css b/app/assets/v2/css/activity_stream.css
index c33bb24a891..0de64047ff6 100644
--- a/app/assets/v2/css/activity_stream.css
+++ b/app/assets/v2/css/activity_stream.css
@@ -70,12 +70,6 @@ a .sup {
   color: black;
 }
 
-.tip_activity,
-.action:hover {
-  background-color: #fafafa;
-  cursor: pointer;
-}
-
 .action.open {
   background-color: #eeeeee;
 }
@@ -89,30 +83,34 @@ a .sup {
 .comment_container .row{
   max-width: 100%;
 }
+
 .comment_container .action{
   cursor: pointer;
 }
+
 .comment_container .action.open,
 .comment_container .open .fa-heart{
   color: var(--gc-pink) !important;
 }
+
 .activity_stream .activity_detail {
   flex: 1;
   font-size: 0.75rem;
 }
 
-.comment_container{
-  padding: 0px;
-}
+.comment_container {
+  background-color: var(--bg-comment-container);
 
-.comment_container.filled{
   text-align: left;
   width: 300px;
-  background-color: #f2f2f2;
   padding: .5rem;
   border-radius: 5px;
 }
 
+.comment_container:empty {
+  display: none;
+}
+
 .comment_container img {
   border-radius: 20px;
   max-width: 40px;
@@ -154,7 +152,6 @@ a .sup {
 }
 
 .activity_stream .activity_comments .comment_container.filled {
-  background-color: #EFF3F6;
   width: 100%;
   margin-top: 1rem;
 }
@@ -190,6 +187,7 @@ a .sup {
 .activity_stream .box {
   padding: 0.75rem 1.2rem;
   border-bottom: 1px solid #EFEFEF;
+  background-color: var(--bg-activity);
 }
 
 #avatar_url .avatar {
@@ -215,12 +213,6 @@ a .sup {
   display: inline-block;
 }
 
-.click-gif.selected,
-#poll-button.selected,
-#video-button.selected {
-  color: black;
-}
-
 #video_container{
   background-color: white;
   text-align: center;
@@ -259,7 +251,6 @@ iframe.popout{
 
 .poll_choices.answered div.vote {
   border: 1px solid #e9e9e9;
-  background-color: #f9f9f9;
   cursor: default;
 }
 
@@ -278,6 +269,7 @@ iframe.popout{
 }
 
 .poll_choices div.answer {
+  color: black;
   border: 3px solid black;
   background-color: #f0f0f0;
 }
@@ -378,7 +370,7 @@ textarea.enter-activity-comment {
 }
 
 .activity_stream .comment_row .activity_comments_main {
-  border-top: 2px solid #e9ecf0;
+  margin-top: 1em;
   padding-top: 5px;
 }
 
diff --git a/app/assets/v2/css/base.css b/app/assets/v2/css/base.css
index 7dd7d6a3d21..d42be180cdb 100644
--- a/app/assets/v2/css/base.css
+++ b/app/assets/v2/css/base.css
@@ -17,7 +17,7 @@ span {
 }
 
 a {
-  color: #3E00FF;
+  color: var(--link-color);
 }
 
 .cursor-pointer {
diff --git a/app/assets/v2/css/colors.css b/app/assets/v2/css/colors.css
index 42ce16e9a8e..1870a0060c6 100644
--- a/app/assets/v2/css/colors.css
+++ b/app/assets/v2/css/colors.css
@@ -26,8 +26,10 @@ html {
   --text-dark: var(--gc-black);
 
   --bg-shade-0: white;
-  --bg-shade-1: white;
+  --bg-shade-1: #EFF3F6;
   --bg-shade-2: #5f5c74;
+  --bg-activity: white;
+  --bg-comment-container: var(--bg-shade-1);
 
   --main-bg: #eff3f6;
   --form-input-bg: white;
@@ -63,19 +65,25 @@ html.dark-mode {
   --gc-blue-grey: #f2f6f9;
   --gc-dark-grey: #868789;
   --gc-darker-grey: #3d3d3d;
+  --gc-medium-dark-gray: #bbbbbb;
+  --gc-darker-grey: #3d3d3d;
 
   --text-light: #D8D8D8;
   --text-dark: var(--gc-black);
 
-  --bg-shade-0: #0a0428;
-  --bg-shade-1: #221d3e;
-  --bg-shade-2: #5f5c74;
+  --bg-shade-0: #221D3E;
+  --bg-shade-1: #373351;
+  --bg-shade-2: #5F5C74;
+  --bg-activity: var(--bg-shade-1);
+  --bg-comment-container: var(--bg-shade-0);
+
+
 
   --main-bg: #0a0428;
-  --form-input-bg: #221d3e;
+  --form-input-bg: #221D3E;
   --form-input-color: white;
   --button-radio-icon-color: white;
-  --link-color: white;
+  --link-color: #91b5ff;
   --townsquare-link-color: white;
   --townsquare-block-header-color: white;
   --active-button-border-color: white;
@@ -116,4 +124,4 @@ html.dark-mode {
 
 .text-medium-dark-grey {
   color: var(--gc-medium-dark-gray);
-}
\ No newline at end of file
+}
diff --git a/app/assets/v2/css/forms/input.css b/app/assets/v2/css/forms/input.css
index 1a156df0430..fc698197952 100644
--- a/app/assets/v2/css/forms/input.css
+++ b/app/assets/v2/css/forms/input.css
@@ -71,3 +71,10 @@ textarea.form__input {
 .amount_container{
   height: 100px;
 }
+
+.dark-mode .form-control,
+.dark-mode .form__input,
+.dark-mode .border,
+.dark-mode .activity_stream .box {
+  border-color:transparent!important;
+}
diff --git a/app/assets/v2/css/gitcoin.css b/app/assets/v2/css/gitcoin.css
index 7325187cb86..84908ff7f9d 100644
--- a/app/assets/v2/css/gitcoin.css
+++ b/app/assets/v2/css/gitcoin.css
@@ -919,9 +919,10 @@ textarea.status-textarea {
 }
 
 .status-menu button {
-  color: #6c757d;
+  color: var(--gc-dark-grey);
 }
 
-.status-menu button.selected {
-  color: black;
+.status-menu button.selected,
+.status-menu button:hover {
+  color: var(--townsquare-link-color);
 }
diff --git a/app/assets/v2/css/notifications.css b/app/assets/v2/css/notifications.css
index 10cfc67a925..aefd0c329c9 100644
--- a/app/assets/v2/css/notifications.css
+++ b/app/assets/v2/css/notifications.css
@@ -2,7 +2,6 @@ html {
   --color-notification: 37, 232, 153;
   --badge-bg: #D6FBEB;
   --badge-text: #00A55E;
-  --link-color: #3E00FF;
   --badge-blue-bg: #E7F0FA;
   --badge-blue-text: #6587AE;
 }
@@ -12,7 +11,6 @@ html.dark-mode {
   --color-notification: 37, 232, 153;
   --badge-bg: #D6FBEB;
   --badge-text: #00A55E;
-  --link-color: #3E00FF;
   --badge-blue-bg: #5f5c74;
   --badge-blue-text: white;
 }
diff --git a/app/assets/v2/css/theme_switcher.css b/app/assets/v2/css/theme_switcher.css
index b5dafc1313f..36372e98b12 100644
--- a/app/assets/v2/css/theme_switcher.css
+++ b/app/assets/v2/css/theme_switcher.css
@@ -4,14 +4,14 @@
 }
 
 .theme-switcher-svg {
-  fill: white;
-  width: 1em;
-  height: 1em;
+  width: 0.7em;
+  height: 0.7em;
   display: inline-block;
   font-size: 1.5rem;
   transition: fill 200ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;
   flex-shrink: 0;
   user-select: none;
+  margin-right: 0.8em;
 }
 
 html:not(.dark-mode) .theme-switcher__dark {
@@ -20,4 +20,4 @@ html:not(.dark-mode) .theme-switcher__dark {
 
 html.dark-mode .theme-switcher__light {
   display: none;
-}
\ No newline at end of file
+}
diff --git a/app/assets/v2/css/town_square.css b/app/assets/v2/css/town_square.css
index 88d6cb89bd6..7ecabc70179 100644
--- a/app/assets/v2/css/town_square.css
+++ b/app/assets/v2/css/town_square.css
@@ -889,6 +889,7 @@ body.green.offer_view .announce {
 
 .townsquare_block-header {
   font-size: 0.9rem;
+  font-weight: 700;
   color: var(--townsquare-block-header-color);
   text-transform: uppercase;
   cursor: pointer;
@@ -911,7 +912,7 @@ body.green.offer_view .announce {
 }
 
 .grey {
-  color: #666666 !important;
+  color: var(--gc-medium-dark-gray) !important;
 }
 .offer_container span{
   display: inline;
@@ -935,7 +936,7 @@ body.green.offer_view .announce {
 }
 
 .activity_time {
-  color: #666666;
+  color: var(--gc-medium-dark-gray);
 }
 
 .filter-tag {
@@ -977,7 +978,7 @@ body.green.offer_view .announce {
 
 .nav-badge {
   font-size: 9px;
-  color: rgba(62,0,255);
+  color: var(--link-color);
   top: -8px;
   position: relative;
   font-weight: bold;
diff --git a/app/assets/v2/js/activity.js b/app/assets/v2/js/activity.js
index 71462df442f..1dc1fb4ce43 100644
--- a/app/assets/v2/js/activity.js
+++ b/app/assets/v2/js/activity.js
@@ -707,7 +707,7 @@ $(document).ready(function() {
         if (is_first_hidden) {
           show_more_box = `
           <div class="row mx-auto ${ show_all_option ? 'show_all' : 'show_more'} d-block text-center">
-            <a href="#" class="text-black-60 font-smaller-5">
+            <a href="#" class="font-smaller-5">
             ${ show_all_option ? 'See all comments' : `Show More (<span class="comment-count">${num_comments - hide_after_n_comments + 1}</span>)`}
             </a>
           </div>
@@ -759,10 +759,10 @@ $(document).ready(function() {
                 </span>
                 <span class="comment_options font-smaller-5 mt-1" style="display: block; text-align: right;">
                   ${is_comment_owner ?
-    `<i data-pk=${comment['id']} class="delete_comment fas fa-trash font-smaller-7 position-relative text-black-70 mr-1 cursor-pointer" style="top:-1px; "></i>| `
+    `<i data-pk=${comment['id']} class="delete_comment fas fa-trash font-smaller-7 position-relative grey mr-1 cursor-pointer" style="top:-1px; "></i>| `
     : ''}
     ${is_comment_owner ?
-    `<i data-pk=${comment['id']} class="edit_comment fas fa-edit font-smaller-7 position-relative text-black-70 mr-1 cursor-pointer" style="top:-1px; "></i>| `
+    `<i data-pk=${comment['id']} class="edit_comment fas fa-edit font-smaller-7 position-relative grey mr-1 cursor-pointer" style="top:-1px; "></i>| `
     : ''}
                   ${show_tip ? `
                   <span class="action like px-0 ${comment['is_liked'] ? 'open' : ''}" data-toggle="tooltip" title="Liked by ${comment['likes']}">
@@ -793,11 +793,11 @@ $(document).ready(function() {
           <div class="comment-area col-12 col-sm-11 text-right">
             <textarea class="form-control bg-lightblue font-caption enter-activity-comment" placeholder="Enter comment" cols="80" rows="3">${existing_text}</textarea>
             <div class="emoji-container position-absolute d-flex flex-wrap">
-              <button class="btn btn-sm p-1 emoji_button" data-toggle="tooltip" title="Add an emoji to post.">
+              <button class="btn btn-sm p-1 emoji_button grey" data-toggle="tooltip" title="Add an emoji to post.">
                 <i class="far fa-fw fa-smile"></i>
               </button>
             </div>
-            <a href=# class="btn btn-gc-blue btn-sm mt-= font-smaller-7 font-weight-bold post_comment">COMMENT</a>
+            <a href=# class="btn btn-gc-blue btn-sm mt-3 font-smaller-7 font-weight-bold post_comment">COMMENT</a>
           </div>
         </div>
       `;
diff --git a/app/dashboard/templates/profiles/status_box.html b/app/dashboard/templates/profiles/status_box.html
index 004afb30fec..2aa3ecc0781 100644
--- a/app/dashboard/templates/profiles/status_box.html
+++ b/app/dashboard/templates/profiles/status_box.html
@@ -59,7 +59,7 @@
       </button>
     </div>
   </div>
-  <div id="thumbnail" class="mt-1 mb-2" style="display: none; top: initial; left: initial; background-color: #FAFAFA">
+  <div id="thumbnail" class="mt-1 mb-2" style="display: none; top: initial; left: initial;">
     <div class="row" style="display: flex; justify-content: center; align-items: center; ">
       <div class="col ml-1 col-sm-3 col-md-2 text-center">
         <img id="thumbnail-img" style="width: 130%;" src="{% static 'v2/images/team/gitcoinbot.png' %}">
diff --git a/app/dashboard/templates/shared/menu.html b/app/dashboard/templates/shared/menu.html
index a8bf0030a63..128e82b2896 100644
--- a/app/dashboard/templates/shared/menu.html
+++ b/app/dashboard/templates/shared/menu.html
@@ -331,6 +331,5 @@ <h5>Weekly leaderboard</h5>
   </nav>
   <nav class="navbar-nav mr-3">
     {% include 'shared/nav_auth.html' with source='authed' %}
-    {% include 'shared/theme_switcher.html' with source='authed' %}
   </nav>
 </div>
diff --git a/app/dashboard/templates/shared/nav_auth.html b/app/dashboard/templates/shared/nav_auth.html
index d6179406e12..df2ccc7273b 100644
--- a/app/dashboard/templates/shared/nav_auth.html
+++ b/app/dashboard/templates/shared/nav_auth.html
@@ -89,6 +89,9 @@
         </a>
       {% endif %}
       <div class="dropdown-divider"></div>
+      {% if is_townsquare %}
+        {% include 'shared/theme_switcher.html' with source='authed' %}
+      {% endif %}
       <a class="dropdown-item" data-gtm="logout" href="{% url "logout" %}?next={{ request.get_full_path }}">
         <i class="fas fa-lock"></i>
         {% trans "Log Out" %}
diff --git a/app/dashboard/templates/shared/theme_switcher.html b/app/dashboard/templates/shared/theme_switcher.html
index 9a87f3a0f13..054fbd2dd2e 100644
--- a/app/dashboard/templates/shared/theme_switcher.html
+++ b/app/dashboard/templates/shared/theme_switcher.html
@@ -1,5 +1,6 @@
-<div id="theme-switcher" class="navbar-nav mr-3" aria-label="Toggle light/dark theme" title="Toggle light/dark theme">
+<div id="theme-switcher" class="dropdown-item" aria-label="Toggle light/dark theme" title="Toggle light/dark theme">
   <svg class="theme-switcher-svg theme-switcher__light" focusable="false" viewBox="0 0 24 24" aria-hidden="true" role="presentation"><path d="M20 8.69V4h-4.69L12 .69 8.69 4H4v4.69L.69 12 4 15.31V20h4.69L12 23.31 15.31 20H20v-4.69L23.31 12 20 8.69zM12 18c-.89 0-1.74-.2-2.5-.55C11.56 16.5 13 14.42 13 12s-1.44-4.5-3.5-5.45C10.26 6.2 11.11 6 12 6c3.31 0 6 2.69 6 6s-2.69 6-6 6z"></path></svg>
 
   <svg class="theme-switcher-svg theme-switcher__dark" focusable="false" viewBox="0 0 24 24" aria-hidden="true" role="presentation"><path d="M20 8.69V4h-4.69L12 .69 8.69 4H4v4.69L.69 12 4 15.31V20h4.69L12 23.31 15.31 20H20v-4.69L23.31 12 20 8.69zM12 18c-3.31 0-6-2.69-6-6s2.69-6 6-6 6 2.69 6 6-2.69 6-6 6zm0-10c-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4z"></path></svg>
-</div>
\ No newline at end of file
+  Darkmode
+</div>
diff --git a/app/retail/templates/shared/activity-vue.html b/app/retail/templates/shared/activity-vue.html
index 898c1d77d5e..844e6fd878e 100644
--- a/app/retail/templates/shared/activity-vue.html
+++ b/app/retail/templates/shared/activity-vue.html
@@ -52,7 +52,7 @@
   })(jQuery)
 </script>
 <script type="text/x-template" id="townsquare-activity-template">
-  <div class="box bg-white d-block m-0 mb-3 activity {{ row.activity_type }} infinite-item px-sm-3 py-4" data-pk="{{row.pk}}">
+  <div class="box d-block m-0 mb-3 activity {{ row.activity_type }} infinite-item px-sm-3 py-4" data-pk="{{row.pk}}">
   <template v-if='row.activity_type == "new_bounty"'>
     <div class="align-items-baseline d-flex font-weight-bold justify-content-between mb-2 mt-n3">
       <b>New Bounty</b>
@@ -435,9 +435,7 @@
   </div>
   {% endif %}
     <div class="activity_comments">
-      <div class="comment_container">
-
-      </div>
+      <div class="comment_container"></div>
     </div>
 </div>
 
diff --git a/app/retail/templates/shared/activity.html b/app/retail/templates/shared/activity.html
index cb3e96aac5c..bfa93876fa8 100644
--- a/app/retail/templates/shared/activity.html
+++ b/app/retail/templates/shared/activity.html
@@ -16,7 +16,7 @@
 
 {% endcomment %}
 {% load humanize i18n static %}
-<div class="box bg-white d-block m-0 mb-3 activity {{ row.activity_type }} infinite-item px-sm-3 py-4" data-pk="{{row.pk}}">
+<div class="box d-block m-0 mb-3 activity {{ row.activity_type }} infinite-item px-sm-3 py-4" data-pk="{{row.pk}}">
   {% if row.activity_type == 'new_bounty' %}
     <div class="align-items-baseline d-flex font-weight-bold justify-content-between mb-2 mt-n3">
       <b>New Bounty</b>
@@ -289,7 +289,7 @@
             </a>
           </span>
 
-          <button class="btn-clean" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
+          <button class="btn-clean grey" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
             <i class="fas fa-ellipsis-h"></i>
           </button>
 
@@ -403,7 +403,7 @@
   </div>
   {% elif row.metadata.resource.type == 'gif' %}
   <div class="mt-1 mb-2" >
-    <div class="row align-items-center bg-light">
+    <div class="row align-items-center">
         <img class="attachment" loading="lazy" data-src="{{ row.metadata.resource.id }}">
     </div>
   </div>
@@ -415,7 +415,7 @@
   </div>
   {% elif row.metadata.resource.type == 'content' %}
   <div class="mt-1 mb-2">
-    <div class="row align-items-center bg-light content">
+    <div class="row align-items-center content">
       <div class="col-12 col-md-3 text-center">
         {% if not row.metadata.resource.image or row.metadata.resource.image  == 'undefined' %}
           <img class="py-2" style="max-height: 7rem;" src="{% static 'v2/images/team/gitcoinbot.png' %}">
@@ -433,8 +433,6 @@
   </div>
   {% endif %}
     <div class="activity_comments">
-      <div class="comment_container">
-
-      </div>
+      <div class="comment_container"></div>
     </div>
 </div>
diff --git a/app/townsquare/templates/townsquare/shared/shareactivity.html b/app/townsquare/templates/townsquare/shared/shareactivity.html
index 60e006c759f..324305c50e4 100644
--- a/app/townsquare/templates/townsquare/shared/shareactivity.html
+++ b/app/townsquare/templates/townsquare/shared/shareactivity.html
@@ -1,6 +1,6 @@
 {% load humanize static i18n %}
             {% if not is_direct_link %}
-              <div class="bg-shade-1 rounded border">
+              <div class="bg-shade-0 rounded border">
                 <div id="status">
                   <div id="char_count" data-toggle="tooltip" title="You have been a Gitcoin community member for {{max_length_offset}} days, and you can post up to 280 + {{max_length_offset}} = {{max_length}} chars in your status update."></div>
                   <div class="position-relative d-flex flex-row px-2 pt-4 pb-2">
@@ -21,9 +21,7 @@
                     <div id="textarea-dropdown" class="dropdown-menu" style="left: initial;"></div>
                     <div class="status-menu position-absolute d-flex flex-wrap" style="width: 3.6em; right: 0; top: 0px;">
                       <button id="emoji-button" class="btn btn-sm p-1" data-toggle="tooltip" title="Add an emoji to post." style="bottom: 3.5em; right: 0;"><i class="far fa-fw fa-smile"></i></button>
-                      {% if is_alpha_tester %}
-                        <button id="video-button" class="btn btn-sm p-1" data-toggle="tooltip" title="Add a video call to post." style="bottom: 3.5em; right: 1.5em;"><i class="fas fa-fw fa-video"></i></i></button>
-                      {% endif %}
+                      <button id="video-button" class="btn btn-sm p-1" data-toggle="tooltip" title="Add a video call to post." style="bottom: 3.5em; right: 1.5em;"><i class="fas fa-fw fa-video"></i></i></button>
                       <div class="dropdown">
                         <button class="btn btn-sm p-1 click-gif" data-toggle="dropdown" id="btn_gif" aria-haspopup="true" aria-expanded="false" style="bottom: 2em; right: 1.5em;">
                           <i class="fas fa-fw fa-photo-video" data-toggle="tooltip" title="Add a gif to post."></i>
@@ -43,7 +41,7 @@
                     </div>
                   </div>
                   <input type="hidden" name="what" value="{{what}}:{{whatid}}">
-                  <div class="bg-lightblue p-2 d-flex flex-column flex-sm-row justify-content-between">
+                  <div class="bg-shade-1 p-2 d-flex flex-column flex-sm-row justify-content-between">
                     <div class="btn-group-toggle text-left activity_type_selector" data-toggle="buttons">
                       {% if tags %}
                         {% for tag in tags %}
@@ -57,7 +55,7 @@
                     </div>
                     <button class="btn btn-gc-blue font-smaller-7 font-weight-bold h-100" id="btn_post" disabled="true">POST</button>
                   </div>
-                  <div id="thumbnail" class="mt-1 mb-2" style="display: none; top: initial; left: initial; background-color: #FAFAFA">
+                  <div id="thumbnail" class="mt-1 mb-2" style="display: none; top: initial; left: initial;">
                     <div class="row" style="display: flex; justify-content: center; align-items: center; ">
                       <div class="col ml-1 col-sm-3 col-md-2 text-center">
                         <img id="thumbnail-img" style="width: 130%;" src="{% static 'v2/images/team/gitcoinbot.png' %}">