diff --git a/modules/aggregator/aggregator-rtl.css b/modules/aggregator/aggregator-rtl.css
deleted file mode 100644
index ea59ca3..0000000
--- a/modules/aggregator/aggregator-rtl.css
+++ /dev/null
@@ -1,4 +0,0 @@
-
-#aggregator .feed-source .feed-icon {
-  float: left;
-}
diff --git a/modules/aggregator/aggregator-wrapper.tpl.php b/modules/aggregator/aggregator-wrapper.tpl.php
index 80b9032..0c2f774 100644
--- a/modules/aggregator/aggregator-wrapper.tpl.php
+++ b/modules/aggregator/aggregator-wrapper.tpl.php
@@ -12,7 +12,7 @@
  * @see template_preprocess_aggregator_wrapper()
  */
 ?>
-<div id="aggregator">
+<div class="aggregator">
   <?php print $content; ?>
   <?php print $pager; ?>
 </div>
diff --git a/modules/aggregator/aggregator.css b/modules/aggregator/aggregator.css
deleted file mode 100644
index 13c58ff..0000000
--- a/modules/aggregator/aggregator.css
+++ /dev/null
@@ -1,38 +0,0 @@
-
-#aggregator .feed-source .feed-title {
-  margin-top: 0;
-}
-#aggregator .feed-source .feed-image img {
-  margin-bottom: 0.75em;
-}
-#aggregator .feed-source .feed-icon {
-  float: right; /* LTR */
-  display: block;
-}
-#aggregator .feed-item {
-  margin-bottom: 1.5em;
-}
-#aggregator .feed-item-title {
-  margin-bottom: 0;
-  font-size: 1.3em;
-}
-#aggregator .feed-item-meta,
-#aggregator .feed-item-body {
-  margin-bottom: 0.5em;
-}
-#aggregator .feed-item-categories {
-  font-size: 0.9em;
-}
-#aggregator td {
-  vertical-align: bottom;
-}
-#aggregator td.categorize-item {
-  white-space: nowrap;
-}
-#aggregator .categorize-item .news-item .body {
-  margin-top: 0;
-}
-#aggregator .categorize-item h3 {
-  margin-bottom: 1em;
-  margin-top: 0;
-}
diff --git a/modules/aggregator/aggregator.info b/modules/aggregator/aggregator.info
index f147740..4d57ba8 100644
--- a/modules/aggregator/aggregator.info
+++ b/modules/aggregator/aggregator.info
@@ -5,4 +5,4 @@ version = VERSION
 core = 8.x
 files[] = aggregator.test
 configure = admin/config/services/aggregator/settings
-stylesheets[all][] = aggregator.css
+stylesheets[all][] = aggregator.theme.css
diff --git a/modules/aggregator/aggregator.theme-rtl.css b/modules/aggregator/aggregator.theme-rtl.css
new file mode 100644
index 0000000..281789a
--- /dev/null
+++ b/modules/aggregator/aggregator.theme-rtl.css
@@ -0,0 +1,3 @@
+.aggregator .feed-source .feed-icon {
+  float: left;
+}
diff --git a/modules/aggregator/aggregator.theme.css b/modules/aggregator/aggregator.theme.css
new file mode 100644
index 0000000..e2182ac
--- /dev/null
+++ b/modules/aggregator/aggregator.theme.css
@@ -0,0 +1,4 @@
+.aggregator .feed-icon {
+  float: right; /* LTR */
+  display: block;
+}
diff --git a/themes/garland/style.css b/themes/garland/style.css
index 4a5961c..079f8a3 100644
--- a/themes/garland/style.css
+++ b/themes/garland/style.css
@@ -868,22 +868,22 @@ ul.inline li {
 /**
  * Aggregator.module
  */
-#aggregator {
+.aggregator {
   margin-top: 1em;
 }
-#aggregator .feed-item-title {
+.aggregator .feed-item-title {
   font-size: 160%;
   line-height: 130%;
 }
-#aggregator .feed-item {
+.aggregator .feed-item {
   border-bottom: 1px solid #e9eff3;
   margin: -1.5em -31px 1.75em;
   padding: 1.5em 31px;
 }
-#aggregator .feed-item-categories {
+.aggregator .feed-item-categories {
   font-size: 0.92em;
 }
-#aggregator .feed-item-meta {
+.aggregator .feed-item-meta {
   font-size: 0.92em;
   color: #898989;
 }