diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 96442fbfd..be4635c87 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -36,6 +36,8 @@ stage {
     color: rgba(0,0,0,0.5);
 }
 
+/* Scroll Bars */
+
 StScrollBar
 {
     padding: 0px;
@@ -86,6 +88,8 @@ StScrollBar StButton#vhandle:hover
     background-color: #292929;
 }
 
+/* Check Boxes */
+
 .check-box ShellGenericContainer {
     spacing: .8em;
 }
@@ -230,7 +234,7 @@ StScrollBar StButton#vhandle:hover
     icon-size: 1.14em;
 }
 
-/* Switches (to be used in menus) */
+/* Switches */
 .toggle-switch {
     width: 65px;
     height: 22px;
@@ -258,10 +262,13 @@ StScrollBar StButton#vhandle:hover
     spacing: .5em;
 }
 
-/* Shared button properties */
+/* Buttons */
 
-.dash-search-button, .notification-button, .notification-icon-button,
-.hotplug-notification-item, .hotplug-resident-eject-button,
+.dash-search-button,
+.notification-button,
+.notification-icon-button,
+.hotplug-notification-item,
+.hotplug-resident-eject-button,
 .modal-dialog-button {
     border: 1px solid #8b8b8b;
     background-gradient-direction: vertical;
@@ -269,23 +276,32 @@ StScrollBar StButton#vhandle:hover
     background-gradient-end: rgba(255, 255, 255, 0);
 }
 
-.dash-search-button:hover, .notification-button:hover,
-.notification-icon-button:hover, .hotplug-notification-item:hover,
-.hotplug-resident-eject-button:hover, .modal-dialog-button:hover {
+.dash-search-button:hover,
+.notification-button:hover,
+.notification-icon-button:hover,
+.hotplug-notification-item:hover,
+.hotplug-resident-eject-button:hover,
+.modal-dialog-button:hover {
     background-gradient-start: rgba(255, 255, 255, 0.3);
     background-gradient-end: rgba(255, 255, 255, 0.1);
 }
 
-.dash-search-button:selected, .notification-button:focus,
-.notification-icon-button:focus, .hotplug-notification-item:focus,
+.dash-search-button:selected,
+.notification-button:focus,
+.notification-icon-button:focus,
+.hotplug-notification-item:focus,
 .modal-dialog-button:focus {
     border: 2px solid #8b8b8b;
 }
 
-.dash-search-button:active, .dash-search-button:pressed,
-.notification-button:active, .notification-icon-button:active,
-.hotplug-notification-item:active, .hotplug-resident-eject-button:active,
-.modal-dialog-button:active, .modal-dialog-button:pressed {
+.dash-search-button:active,
+.dash-search-button:pressed,
+.notification-button:active,
+.notification-icon-button:active,
+.hotplug-notification-item:active,
+.hotplug-resident-eject-button:active,
+.modal-dialog-button:active,
+.modal-dialog-button:pressed {
     background-gradient-start: rgba(255, 255, 255, 0);
     background-gradient-end: rgba(255, 255, 255, 0.2);
 }
@@ -388,6 +404,8 @@ StScrollBar StButton#vhandle:hover
     -boxpointer-gap: 4px
 }
 
+/* User Menu */
+
 #panelUserMenu {
     spacing: 4px;
 }
@@ -533,6 +551,8 @@ StScrollBar StButton#vhandle:hover
     padding: 1em;
 }
 
+/* Search Box */
+
 #searchArea {
     padding: 0px 24px;
 }
@@ -577,6 +597,8 @@ StScrollBar StButton#vhandle:hover
     color: #8d8f8a;
 }
 
+/* View Tabs */
+
 .view-tab-title {
     color: #888a85;
     font-size: 12pt;
@@ -595,6 +617,8 @@ StScrollBar StButton#vhandle:hover
     border-radius: 0.25em;
 }
 
+/* Search Results */
+
 #searchResults {
     padding: 20px 10px 10px 10px;
     spacing: 18px;
@@ -661,7 +685,7 @@ StScrollBar StButton#vhandle:hover
     -x-offset: 8px;
 }
 
-/* Apps */
+/* Application Launchers and Grid */
 
 .icon-grid {
     spacing: 36px;