diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 9668abf09..7ee41a343 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -11,6 +11,7 @@
  - fixed #11215: Los Angeles cannot be default timezone
  - fixed #11220: Map asset badly broken
  - fixed #11222: testEnvironment.pl Missing Dependencies
+ - fixed #11226: New stylesheet (wg-base.css), new style templates (from the TWG)
 
 7.8.4
  - Fixed a compatibility problem between WRE and new Spectre code.
diff --git a/docs/gotcha.txt b/docs/gotcha.txt
index c294a19a0..24271457b 100644
--- a/docs/gotcha.txt
+++ b/docs/gotcha.txt
@@ -15,6 +15,25 @@ save you many hours of grief.
       the Visitor account.  Previously, based on how the user was created,
       they would get default values from different places.
 
+*	The following style templates have been cleaned up by the TWG:
+	- WebGUI 6 Blank Style, Style 01; Style 02, Style 03:
+		- no structural changes
+	- Fail safe:
+		- added new CSS that is more robust and validates (in external file: style.css);
+		- it was also necessary to update the css to work with the new navigation templates
+		- changed the markup and the order of the home/login/user/admin controls at the bottom
+	- All of the above templates:
+		- added a link tag to wg-base.css
+		- added conditional comments at the top and bottom of the body tag to be able to target
+		  IE versions easily with css
+
+*	Added wg-base.css, which is linked to in each style template. This stylesheet is for css that
+	is used in more than one tempalte, like pagination inline icons etc. Inline styles that are
+	removed from templates, will be replaced with styles in wg-base.css (and example is RFE 11182).
+	Elements that are styled in wg-base.css have a classname that starts with "wg-".
+
+    wg-base.css replaces webgui.css, which will be removed from the site.
+
 7.8.4
 --------------------------------------------------------------------
     * A bug introduced in 7.8.1 could cause the Shop sale notification
diff --git a/docs/upgrades/packages-7.8.5/css.wgpkg b/docs/upgrades/packages-7.8.5/css.wgpkg
new file mode 100644
index 000000000..e2bbbbc0f
Binary files /dev/null and b/docs/upgrades/packages-7.8.5/css.wgpkg differ
diff --git a/docs/upgrades/packages-7.8.5/root_import_style.wgpkg b/docs/upgrades/packages-7.8.5/root_import_style.wgpkg
new file mode 100644
index 000000000..7a324f859
Binary files /dev/null and b/docs/upgrades/packages-7.8.5/root_import_style.wgpkg differ
diff --git a/docs/upgrades/packages-7.8.5/style_01.wgpkg b/docs/upgrades/packages-7.8.5/style_01.wgpkg
new file mode 100644
index 000000000..a23322b09
Binary files /dev/null and b/docs/upgrades/packages-7.8.5/style_01.wgpkg differ
diff --git a/docs/upgrades/packages-7.8.5/style_02.wgpkg b/docs/upgrades/packages-7.8.5/style_02.wgpkg
new file mode 100644
index 000000000..cf0e8adb9
Binary files /dev/null and b/docs/upgrades/packages-7.8.5/style_02.wgpkg differ
diff --git a/docs/upgrades/packages-7.8.5/style_03.wgpkg b/docs/upgrades/packages-7.8.5/style_03.wgpkg
new file mode 100644
index 000000000..3791ffe8c
Binary files /dev/null and b/docs/upgrades/packages-7.8.5/style_03.wgpkg differ
diff --git a/docs/upgrades/upgrade_7.8.4-7.8.5.pl b/docs/upgrades/upgrade_7.8.4-7.8.5.pl
index 04c47c2fd..d32797563 100644
--- a/docs/upgrades/upgrade_7.8.4-7.8.5.pl
+++ b/docs/upgrades/upgrade_7.8.4-7.8.5.pl
@@ -32,6 +32,7 @@ my $session = start(); # this line required
 fixPackageFlagOnOlder( $session );
 addEMSSubmissionTables($session);
 configEMSActivities($session);
+removeOldWebGUICSS($session);
 
 
 # upgrade functions go here
@@ -48,6 +49,19 @@ finish($session); # this line required
 #    print "DONE!\n" unless $quiet;
 #}
 
+#----------------------------------------------------------------------------
+# Describe what our function does
+sub removeOldWebGUICSS {
+    my $session = shift;
+    print "\tRemoving the old webgui.css file... " unless $quiet;
+    my $snippet = WebGUI::Asset->newByDynamicClass($session, 'PcRRPhh-0KfvLLNIPdxJTw');
+    if ($snippet) {
+        $snippet->purge;
+    }
+    # and here's our code
+    print "DONE!\n" unless $quiet;
+}
+
 #----------------------------------------------------------------------------
 # Describe what our function does
 sub configEMSActivities {