diff --git a/source/_static/css/homepage-v1.css b/source/_static/css/homepage-v1.css
index e4e593c147b..79bec75b5b3 100644
--- a/source/_static/css/homepage-v1.css
+++ b/source/_static/css/homepage-v1.css
@@ -326,13 +326,34 @@ body:not([data-custom-theme=light]) .mm-code-copy code pre {
   font-size: 12px;
 }
 
+table.align-default {
+  min-width: 500px;
+  overflow: auto;
+}
+
+table.align-default td {
+  min-width: 200px;
+}
+
 ::-moz-selection {
   /* Code for Firefox */
-  background: #DEEAFA;
+  background: rgba(255, 188, 31, 0.2);
 }
 
 ::selection {
-  background: #DEEAFA;
+  background: rgba(255, 188, 31, 0.2);
+}
+
+body:not([data-custom-theme=light]) ::-moz-selection {
+  /* Code for Firefox */
+  background: rgba(0, 102, 235, 0.4);
+}
+body:not([data-custom-theme=light]) ::selection {
+  background: rgba(0, 102, 235, 0.4);
+}
+
+.bg-white {
+  background: #fff;
 }
 
 .masthead {
diff --git a/source/_static/css/homepage-v1.css.map b/source/_static/css/homepage-v1.css.map
index 46fd54b8152..7f159a0db42 100644
--- a/source/_static/css/homepage-v1.css.map
+++ b/source/_static/css/homepage-v1.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../scss/partials/_variables.scss","../scss/partials/_header.scss","../scss/partials/_sidebar.scss","../scss/partials/_blog.scss","../scss/partials/_mixins.scss","../scss/partials/_masthead.scss","../scss/partials/_thermometer.scss","../scss/partials/_badge.scss","../scss/homepage-v1.scss"],"names":[],"mappings":"AAAA;AAUA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AC5BE;EADJ;IAEQ;;;;AAIR;EACI;;AAEA;EACI;;;AAKJ;EACI;;AAGJ;EACI;;;AAIR;EACI;IACI;IACA;;;EAGJ;IACI;;;AAIR;EACI;IACI;IACA;;;EAGJ;IACI;;;AC1CR;EACI;EACA;;;AAGJ;AAEA;EACI;EACA;;AAEA;EACI;;;AAIR;EACI;;;AAGJ;EACI;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;;AAKJ;EACI;;AAIA;EACI;EACA;EACA;;AAGJ;EACI;;;AAKZ;EACI;EACA;EACA;;AAEA;EACI;;;AAMA;EACI;;;AAKZ;EACI;EACA;EACA;;;AAGJ;AAAA;EAEI;;;AAIA;EACI;;AAGJ;EACI;EACA;;AAGJ;AAAA;EAEI;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;EACI;EACA;;;AAIR;EACI;IACI;IACA;;;EAGJ;IACI;IACA;;;ACtHR;AAAA;AAAA;AAAA;AAAA;AAAA;EAMI;EACA;;;AAGJ;AAAA;EAEI;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAIR;EAEI;;AAEA;EACI;EACA;;AAEA;EACI;;AAKZ;EACI;;AAEA;EACI;EACA;;AAEA;EACI;;;AAMhB;EACI;EACA;;AAEA;EACI;;;AAIR;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;;AAEA;EACI;;;AAKJ;EC7CA;;ADiDA;ECjDA;;ADqDA;EACI;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;AAAA;EAEI;EACA;;AAEA;AAAA;EACI;;;AAKZ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;EACA;EACA;EACA;EACA;;;AAIR;EACI;EACA;;;AAIJ;AACI;EACA;;;AAGJ;EACI;;;AEhMJ;EACI;EACA;EACA;;AAEA;EACI;EACA;;AAEA;EACI;EACA;EACA;;AAEA;EACI;;;AAMhB;EACI;EACA;EACA;EACA;EACA;;;AAGJ;EACI;IACI;;;EAIA;IACI;;;AAMZ;EACI;EACA;;AAEA;EAJJ;IAKQ;;;;AAIR;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;;AAEA;EANJ;IAOQ;;;AAGJ;EACI;;;AAIR;EACI;EACA;EACA;EACA;AACA;EACA;;;AAGJ;EACI;EACA;EACA;;AAEA;EACI;;AAGJ;EATJ;IAUQ;IACA;;;;AAKR;EACI;EACA;EACA;EACA;EACA;EACA;;AAGI;EACI;;;AAKZ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;;;AAIR;EACI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;;AAGJ;EACI;EACA;EACA;;;AAOJ;EACI;;AAGJ;EACI;;AAGJ;EACI;EACA;;AAEA;EACI;;AAGJ;EACI;;AAIR;EACI;;AAEA;EACI;;;ACzLZ;AACA;EACI;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;AAAA;EAEI;EACA;;;AAGJ;AAEA;AACA;EACI;EACA;;;AAGJ;AAEA;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;;;AAIA;EACI;;AAGJ;EACI;EACA;;;AAIR;AAAA;AAAA;EAGI;;;AAGJ;AAEA;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAKJ;AAEA;EACI;IACI;IACA;IACA;IACA;IACA;;;EAGJ;IACI;;;EAGJ;IACI;IACA;IACA;;;AC/QR;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;;;AAKZ;EACI;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;;AAEA;EHaJ;;;AGLI;EACI;;AAEA;EHER;;AGMQ;EACI;;;ACxDhB;EACI;EACA;;AAII;AAAA;AAAA;EAGI;;AAGJ;EACI;;AAIA;EADJ;IAEQ;;;AAIR;EACI;;AAGJ;EACI;;;AAKZ;AAAA;AAAA;EAGI;;;AAKA;EACI;EACA;;AAEA;EACI;EACA;;AAGJ;EACI;;;AAKZ;EACI;;;AAIA;EACI;;AAEA;EACI;EACA;;;AAMR;EACI;;;AAIR;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;;;AAIR;EACI;IACI;;;EAGJ;IACI;IACA;;;EAGJ;IACI;IACA;IACA;IACA;IACA;IACA;;;AAIR;EACI;EACA;;;AAKJ;EACI;EACA;EACA;EACA;EACA;AACA;EACA;;;AAKA;EACI","file":"homepage-v1.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../scss/partials/_variables.scss","../scss/partials/_header.scss","../scss/partials/_sidebar.scss","../scss/partials/_blog.scss","../scss/partials/_mixins.scss","../scss/partials/_masthead.scss","../scss/partials/_thermometer.scss","../scss/partials/_badge.scss","../scss/homepage-v1.scss"],"names":[],"mappings":"AAAA;AAUA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AC5BE;EADJ;IAEQ;;;;AAIR;EACI;;AAEA;EACI;;;AAKJ;EACI;;AAGJ;EACI;;;AAIR;EACI;IACI;IACA;;;EAGJ;IACI;;;AAIR;EACI;IACI;IACA;;;EAGJ;IACI;;;AC1CR;EACI;EACA;;;AAGJ;AAEA;EACI;EACA;;AAEA;EACI;;;AAIR;EACI;;;AAGJ;EACI;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;;AAKJ;EACI;;AAIA;EACI;EACA;EACA;;AAGJ;EACI;;;AAKZ;EACI;EACA;EACA;;AAEA;EACI;;;AAMA;EACI;;;AAKZ;EACI;EACA;EACA;;;AAGJ;AAAA;EAEI;;;AAIA;EACI;;AAGJ;EACI;EACA;;AAGJ;AAAA;EAEI;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;EACI;EACA;;;AAIR;EACI;IACI;IACA;;;EAGJ;IACI;IACA;;;ACtHR;AAAA;AAAA;AAAA;AAAA;AAAA;EAMI;EACA;;;AAGJ;AAAA;EAEI;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAIR;EAEI;;AAEA;EACI;EACA;;AAEA;EACI;;AAKZ;EACI;;AAEA;EACI;EACA;;AAEA;EACI;;;AAMhB;EACI;EACA;;AAEA;EACI;;;AAIR;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;;AAEA;EACI;;;AAKJ;EC7CA;;ADiDA;ECjDA;;ADqDA;EACI;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;AAAA;EAEI;EACA;;AAEA;AAAA;EACI;;;AAKZ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;EACA;EACA;EACA;EACA;;;AAIR;EACI;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;;;AAIJ;AACI;EACA;;;AAGJ;EACI;;;AAIA;AACI;EACA;;AAGJ;EACI;;;AAKR;EACI;;;AEzNJ;EACI;EACA;EACA;;AAEA;EACI;EACA;;AAEA;EACI;EACA;EACA;;AAEA;EACI;;;AAMhB;EACI;EACA;EACA;EACA;EACA;;;AAGJ;EACI;IACI;;;EAIA;IACI;;;AAMZ;EACI;EACA;;AAEA;EAJJ;IAKQ;;;;AAIR;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;;AAEA;EANJ;IAOQ;;;AAGJ;EACI;;;AAIR;EACI;EACA;EACA;EACA;AACA;EACA;;;AAGJ;EACI;EACA;EACA;;AAEA;EACI;;AAGJ;EATJ;IAUQ;IACA;;;;AAKR;EACI;EACA;EACA;EACA;EACA;EACA;;AAGI;EACI;;;AAKZ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;;;AAIR;EACI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;;AAGJ;EACI;EACA;EACA;;;AAOJ;EACI;;AAGJ;EACI;;AAGJ;EACI;EACA;;AAEA;EACI;;AAGJ;EACI;;AAIR;EACI;;AAEA;EACI;;;ACzLZ;AACA;EACI;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;AAAA;EAEI;EACA;;;AAGJ;AAEA;AACA;EACI;EACA;;;AAGJ;AAEA;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;;;AAIA;EACI;;AAGJ;EACI;EACA;;;AAIR;AAAA;AAAA;EAGI;;;AAGJ;AAEA;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAKJ;AAEA;EACI;IACI;IACA;IACA;IACA;IACA;;;EAGJ;IACI;;;EAGJ;IACI;IACA;IACA;;;AC/QR;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;;;AAKZ;EACI;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;;AAEA;EHaJ;;;AGLI;EACI;;AAEA;EHER;;AGMQ;EACI;;;ACxDhB;EACI;EACA;;AAII;AAAA;AAAA;EAGI;;AAGJ;EACI;;AAIA;EADJ;IAEQ;;;AAIR;EACI;;AAGJ;EACI;;;AAKZ;AAAA;AAAA;EAGI;;;AAKA;EACI;EACA;;AAEA;EACI;EACA;;AAGJ;EACI;;;AAKZ;EACI;;;AAIA;EACI;;AAEA;EACI;EACA;;;AAMR;EACI;;;AAIR;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;;;AAIR;EACI;IACI;;;EAGJ;IACI;IACA;;;EAGJ;IACI;IACA;IACA;IACA;IACA;IACA;;;AAIR;EACI;EACA;;;AAKJ;EACI;EACA;EACA;EACA;EACA;AACA;EACA;;;AAKA;EACI","file":"homepage-v1.css"}
\ No newline at end of file
diff --git a/source/_static/scss/partials/_blog.scss b/source/_static/scss/partials/_blog.scss
index fa75ea302cc..41b9e8b6b91 100644
--- a/source/_static/scss/partials/_blog.scss
+++ b/source/_static/scss/partials/_blog.scss
@@ -183,12 +183,37 @@ body:not([data-custom-theme="light"]) {
     font-size: 12px;
 }
 
+table.align-default {
+    min-width: 500px;
+    overflow: auto;
+}
+
+table.align-default td {
+    min-width: 200px;
+}
+
 
 ::-moz-selection {
     /* Code for Firefox */
-    background: #DEEAFA;
+    background: hsla(42, 100%, 56%, 0.2);
 }
 
 ::selection {
-    background: #DEEAFA;
+    background: hsla(42, 100%, 56%, 0.2);
+}
+
+body:not([data-custom-theme="light"]) {
+    ::-moz-selection {
+        /* Code for Firefox */
+        background: hsla(214, 100%, 46%, 0.4);
+    }
+
+    ::selection {
+        background: hsla(214, 100%, 46%, 0.4);
+    }
+}
+
+
+.bg-white {
+    background: #fff;
 }
diff --git a/source/getting-started/architecture-overview.rst b/source/getting-started/architecture-overview.rst
index b1a339970d4..4a0acecd227 100644
--- a/source/getting-started/architecture-overview.rst
+++ b/source/getting-started/architecture-overview.rst
@@ -139,36 +139,43 @@ Each AWS diagram represents a full High Availability deployment on Amazon Web Se
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. image:: ../images/MattermostDeployment5kUsers.png
+  :class: bg-white
 
 5,000 users on Enterprise - AWS
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. image:: ../images/MattermostDeployment5kaws.png
+  :class: bg-white
 
 10,000 users on Enterprise - General
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. image:: ../images/MattermostDeployment10kUsers.png
+  :class: bg-white
 
 10,000 users on Enterprise - AWS
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. image:: ../images/MattermostDeployment10kaws.png
+  :class: bg-white
 
 25,000 users on Enterprise - General
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. image:: ../images/MattermostDeployment25kUsers.png
+  :class: bg-white
 
 25,000 users on Enterprise - AWS
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. image:: ../images/MattermostDeployment25kaws.png
+  :class: bg-white
 
 50,000 users on Enterprise - AWS
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. image:: ../images/MattermostDeployment50kaws.png
+  :class: bg-white
 
 Database with VIPs
 ~~~~~~~~~~~~~~~~~~
@@ -176,6 +183,7 @@ Database with VIPs
 The following diagram is a suggested configuration for Highly-Available databases through virtual IPs.
 
 .. image:: ../images/DatabasewithVIPs.png
+  :class: bg-white
 
 Load testing
 ~~~~~~~~~~~~