diff --git a/modules/poll/poll.admin.css b/modules/poll/poll.admin.css
new file mode 100644
index 0000000..6d9359e
--- /dev/null
+++ b/modules/poll/poll.admin.css
@@ -0,0 +1,12 @@
+
+.node-form #edit-poll-more {
+  margin: 0;
+}
+.node-form #poll-choice-table .form-text {
+  display: inline;
+  width: auto;
+}
+.node-form #poll-choice-table td.choice-flag {
+  white-space: nowrap;
+  width: 4em;
+}
\ No newline at end of file
diff --git a/modules/poll/poll.base.css b/modules/poll/poll.base.css
new file mode 100644
index 0000000..dbb5ac9
--- /dev/null
+++ b/modules/poll/poll.base.css
@@ -0,0 +1,18 @@
+
+.poll {
+  overflow: hidden;
+}
+.poll .bar {
+  height: 1em;
+  margin: 1px 0;
+}
+.poll .bar .foreground {
+  height: 1em;
+  float: left; /* LTR */
+}
+td.poll-chtext {
+  width: 80%;
+}
+td.poll-chvotes .form-text {
+  width: 85%;
+}
\ No newline at end of file
diff --git a/modules/poll/poll.css b/modules/poll/poll.css
deleted file mode 100644
index 8b04e38..0000000
--- a/modules/poll/poll.css
+++ /dev/null
@@ -1,51 +0,0 @@
-
-.poll {
-  overflow: hidden;
-}
-.poll .bar {
-  height: 1em;
-  margin: 1px 0;
-  background-color: #ddd;
-}
-.poll .bar .foreground {
-  background-color: #000;
-  height: 1em;
-  float: left; /* LTR */
-}
-.poll .links {
-  text-align: center;
-}
-.poll .percent {
-  text-align: right; /* LTR */
-}
-.poll .total {
-  text-align: center;
-}
-.poll .vote-form {
-  text-align: center;
-}
-.poll .vote-form .choices {
-  text-align: left; /* LTR */
-  margin: 0 auto;
-  display: table;
-}
-.poll .vote-form .choices .title {
-  font-weight: bold;
-}
-.node-form #edit-poll-more {
-  margin: 0;
-}
-.node-form #poll-choice-table .form-text {
-  display: inline;
-  width: auto;
-}
-.node-form #poll-choice-table td.choice-flag {
-  white-space: nowrap;
-  width: 4em;
-}
-td.poll-chtext {
-  width: 80%;
-}
-td.poll-chvotes .form-text {
-  width: 85%;
-}
diff --git a/modules/poll/poll.info b/modules/poll/poll.info
index de6ac25..ade0724 100644
--- a/modules/poll/poll.info
+++ b/modules/poll/poll.info
@@ -4,4 +4,6 @@ package = Core
 version = VERSION
 core = 8.x
 files[] = poll.test
-stylesheets[all][] = poll.css
+stylesheets[all][] = poll.base.css
+stylesheets[all][] = poll.theme.css
+stylesheets[all][] = poll.admin.css
diff --git a/modules/poll/poll.theme.css b/modules/poll/poll.theme.css
new file mode 100644
index 0000000..cc0c4c7
--- /dev/null
+++ b/modules/poll/poll.theme.css
@@ -0,0 +1,27 @@
+
+.poll .vote-form {
+  text-align: center;
+}
+.poll .vote-form .choices {
+  text-align: left; /* LTR */
+  margin: 0 auto;
+  display: table;
+}
+.poll .total {
+  text-align: center;
+}
+.poll .links {
+  text-align: center;
+}
+.poll .percent {
+  text-align: right; /* LTR */
+}
+.poll .vote-form .choices .title {
+  font-weight: bold;
+}
+.poll .bar {
+  background-color: #ddd;
+}
+.poll .bar .foreground {
+  background-color: #000;
+}
\ No newline at end of file