diff --git a/app/components/post_list/post/body/content/message_attachments/__snapshots__/attachment_author.test.tsx.snap b/app/components/post_list/post/body/content/message_attachments/__snapshots__/attachment_author.test.tsx.snap
index b4c17271a..b168b7c78 100644
--- a/app/components/post_list/post/body/content/message_attachments/__snapshots__/attachment_author.test.tsx.snap
+++ b/app/components/post_list/post/body/content/message_attachments/__snapshots__/attachment_author.test.tsx.snap
@@ -46,7 +46,7 @@ exports[`AttachmentAuthor it matches snapshot when both name and icon are provid
           "fontSize": 11,
         },
         {
-          "color": "rgba(28,88,217,0.5)",
+          "color": "rgba(56,111,229,0.5)",
         },
       ]
     }
@@ -114,7 +114,7 @@ exports[`AttachmentAuthor it matches snapshot when only name is provided 1`] = `
           "fontSize": 11,
         },
         {
-          "color": "rgba(28,88,217,0.5)",
+          "color": "rgba(56,111,229,0.5)",
         },
       ]
     }
diff --git a/app/components/post_list/thread_overview/__snapshots__/thread_overview.test.tsx.snap b/app/components/post_list/thread_overview/__snapshots__/thread_overview.test.tsx.snap
index feef6553e..d95de26d3 100644
--- a/app/components/post_list/thread_overview/__snapshots__/thread_overview.test.tsx.snap
+++ b/app/components/post_list/thread_overview/__snapshots__/thread_overview.test.tsx.snap
@@ -77,7 +77,7 @@ exports[`ThreadOverview should match snapshot when post is not saved and 0 repli
         }
       >
         <Icon
-          color="#1C58D9"
+          color="#386fe5"
           name="bookmark"
           size={24}
         />
diff --git a/app/components/server_icon/__snapshots__/server_icon.test.tsx.snap b/app/components/server_icon/__snapshots__/server_icon.test.tsx.snap
index 55309659d..d092fb65a 100644
--- a/app/components/server_icon/__snapshots__/server_icon.test.tsx.snap
+++ b/app/components/server_icon/__snapshots__/server_icon.test.tsx.snap
@@ -110,7 +110,7 @@ exports[`Server Icon Server Icon Component should match snapshot with mentions 1
         {
           "alignSelf": "flex-end",
           "backgroundColor": "#ffffff",
-          "borderColor": "#14213e",
+          "borderColor": "#162545",
           "borderRadius": 11,
           "borderWidth": 2,
           "color": "#1e325c",
@@ -198,7 +198,7 @@ exports[`Server Icon Server Icon Component should match snapshot with unreads 1`
         {
           "alignSelf": "flex-end",
           "backgroundColor": "#ffffff",
-          "borderColor": "#14213e",
+          "borderColor": "#162545",
           "borderRadius": 6,
           "borderWidth": 2,
           "color": "#1e325c",
diff --git a/app/constants/preferences.ts b/app/constants/preferences.ts
index 1755530d0..110c6a042 100644
--- a/app/constants/preferences.ts
+++ b/app/constants/preferences.ts
@@ -68,11 +68,11 @@ const Preferences = {
             sidebarText: '#ffffff',
             sidebarUnreadText: '#ffffff',
             sidebarTextHoverBg: '#28427b',
-            sidebarTextActiveBorder: '#579eff',
-            sidebarTextActiveColor: '#5d89ea',
+            sidebarTextActiveBorder: '#5d89ea',
+            sidebarTextActiveColor: '#ffffff',
             sidebarHeaderBg: '#192a4d',
             sidebarHeaderTextColor: '#ffffff',
-            sidebarTeamBarBg: '#14213e',
+            sidebarTeamBarBg: '#162545',
             onlineIndicator: '#3db887',
             awayIndicator: '#ffbc1f',
             dndIndicator: '#d24b4e',
@@ -81,7 +81,7 @@ const Preferences = {
             centerChannelBg: '#ffffff',
             centerChannelColor: '#3f4350',
             newMessageSeparator: '#cc8f00',
-            linkColor: '#1C58D9',
+            linkColor: '#386fe5',
             buttonBg: '#1c58d9',
             buttonColor: '#ffffff',
             errorTextColor: '#d24b4e',
@@ -91,15 +91,15 @@ const Preferences = {
         },
         sapphire: {
             type: 'Sapphire',
-            sidebarBg: '#174ab5',
+            sidebarBg: '#1543a3',
             sidebarText: '#ffffff',
             sidebarUnreadText: '#ffffff',
             sidebarTextHoverBg: '#2a58ba',
             sidebarTextActiveBorder: '#57b5f0',
             sidebarTextActiveColor: '#ffffff',
-            sidebarHeaderBg: '#1542a2',
+            sidebarHeaderBg: '#123b91',
             sidebarHeaderTextColor: '#ffffff',
-            sidebarTeamBarBg: '#133a91',
+            sidebarTeamBarBg: '#123582',
             onlineIndicator: '#3db887',
             awayIndicator: '#ffbc1f',
             dndIndicator: '#d24b4e',
@@ -119,14 +119,14 @@ const Preferences = {
         quartz: {
             type: 'Quartz',
             sidebarBg: '#f4f4f6',
-            sidebarText: '#090a0b',
-            sidebarUnreadText: '#2d3039',
-            sidebarTextHoverBg: '#ebebed',
+            sidebarText: '#1f2228',
+            sidebarUnreadText: '#1f2228',
+            sidebarTextHoverBg: '#e8eaed',
             sidebarTextActiveBorder: '#32a4ec',
-            sidebarTextActiveColor: '#2d3039',
-            sidebarHeaderBg: '#e8e9ed',
-            sidebarHeaderTextColor: '#2d3039',
-            sidebarTeamBarBg: '#dddfe4',
+            sidebarTextActiveColor: '#1f2228',
+            sidebarHeaderBg: '#ebecef',
+            sidebarHeaderTextColor: '#1f2228',
+            sidebarTeamBarBg: '#e5e7eb',
             onlineIndicator: '#3db887',
             awayIndicator: '#f5ab07',
             dndIndicator: '#d24b4e',
@@ -145,52 +145,52 @@ const Preferences = {
         },
         indigo: {
             type: 'Indigo',
-            sidebarBg: '#0f1a2e',
+            sidebarBg: '#151e32',
             sidebarText: '#ffffff',
             sidebarUnreadText: '#ffffff',
             sidebarTextHoverBg: '#222c3f',
-            sidebarTextActiveBorder: '#1279ba',
+            sidebarTextActiveBorder: '#4a7ce8',
             sidebarTextActiveColor: '#ffffff',
-            sidebarHeaderBg: '#152231',
-            sidebarHeaderTextColor: '#dddfe4',
-            sidebarTeamBarBg: '#05080f',
+            sidebarHeaderBg: '#182339',
+            sidebarHeaderTextColor: '#ffffff',
+            sidebarTeamBarBg: '#1c2740',
             onlineIndicator: '#3db887',
             awayIndicator: '#f5ab00',
             dndIndicator: '#d24b4e',
-            mentionBg: '#1c58d9',
+            mentionBg: '#4a7ce8',
             mentionColor: '#ffffff',
-            centerChannelBg: '#0a111f',
+            centerChannelBg: '#111827',
             centerChannelColor: '#dddfe4',
             newMessageSeparator: '#81a3ef',
             linkColor: '#5d89ea',
-            buttonBg: '#386fe5',
+            buttonBg: '#4a7ce8',
             buttonColor: '#ffffff',
             errorTextColor: '#d24b4e',
             mentionHighlightBg: '#133a91',
             mentionHighlightLink: '#a4f4f4',
-            codeTheme: 'github',
+            codeTheme: 'solarized-dark',
         },
         onyx: {
             type: 'Onyx',
-            sidebarBg: '#121317',
+            sidebarBg: '#202228',
             sidebarText: '#ffffff',
             sidebarUnreadText: '#ffffff',
             sidebarTextHoverBg: '#25262a',
-            sidebarTextActiveBorder: '#1592e0',
+            sidebarTextActiveBorder: '#4a7ce8',
             sidebarTextActiveColor: '#ffffff',
-            sidebarHeaderBg: '#1b1d22',
-            sidebarHeaderTextColor: '#dddfe4',
-            sidebarTeamBarBg: '#000000',
+            sidebarHeaderBg: '#24272d',
+            sidebarHeaderTextColor: '#ffffff',
+            sidebarTeamBarBg: '#292c33',
             onlineIndicator: '#3db887',
             awayIndicator: '#f5ab00',
             dndIndicator: '#d24b4e',
-            mentionBg: '#1c58d9',
+            mentionBg: '#4b7ce7',
             mentionColor: '#ffffff',
-            centerChannelBg: '#090a0b',
-            centerChannelColor: '#dddfe4',
+            centerChannelBg: '#191b1f',
+            centerChannelColor: '#e3e4e8',
             newMessageSeparator: '#1adbdb',
             linkColor: '#5d89ea',
-            buttonBg: '#386fe5',
+            buttonBg: '#4a7ce8',
             buttonColor: '#ffffff',
             errorTextColor: '#da6c6e',
             mentionHighlightBg: '#0d6e6e',