diff --git a/plugins/QnA/css/qna.css b/plugins/QnA/css/qna.css
index dd56d8ccf0..83da635520 100644
--- a/plugins/QnA/css/qna.css
+++ b/plugins/QnA/css/qna.css
@@ -1,3 +1,5 @@
+/* QnA */
+
 .question .answer-count, .qna-full-question .answer-count {
     display: block;
     clear: left;
@@ -76,3 +78,76 @@ ul.qna-dummy + ul.threaded-replies li.notice:first-child, li.notice-answer + li.
     display: block;
     font-style: italic;
 }
+
+.question div.question-description {
+    font-size: 1em;
+    line-height: 1.36em;
+    margin-top: 0px;
+    opacity: 1;
+}
+
+.question div.answer-content, .qna-full-question div.answer-content {
+    font-size: 1em;
+    opacity: 1;
+}
+
+.qna-dummy-placeholder input, .question #qna-answer, .qna-full-question #qna-answer {
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
+    -moz-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
+    -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
+}
+
+.question-description input.submit, .answer-content input.submit {
+    height: auto;
+    padding: 0px 10px;
+    margin: 6px 0px 10px 0px;
+    color:#fff;
+    font-weight: bold;
+    text-transform: uppercase;
+    font-size: 1.1em;
+    text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2);
+    border: 1px solid #d7621c;
+    border-radius: 4px;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    background: #FB6104;
+    background: -moz-linear-gradient(top, #ff9d63 0%, #fb6104 100%);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ff9d63), color-stop(100%,#fb6104));
+    background: -webkit-linear-gradient(top, #ff9d63 0%,#fb6104 100%);
+    background: -o-linear-gradient(top, #ff9d63 0%,#fb6104 100%);
+    background: -ms-linear-gradient(top, #ff9d63 0%,#fb6104 100%);
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff9d63', endColorstr='#fb6104',GradientType=0 );
+    background: linear-gradient(top, #ff9d63 0%,#fb6104 100%);
+}
+
+#qna-answer-submit {
+    min-width: 100px;
+}
+
+.question .question-description input.submit:hover, .question .answer-content input.submit:hover {
+    text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.6);
+    background: #ff9d63;
+    background: -moz-linear-gradient(top, #fb6104 0%, #fc8035 100%);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fb6104), color-stop(100%,#fc8035));
+    background: -webkit-linear-gradient(top, #fb6104 0%,#fc8035 100%);
+    background: -o-linear-gradient(top, #fb6104 0%,#fc8035 100%);
+    background: -ms-linear-gradient(top, #fb6104 0%,#fc8035 100%);
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fb6104', endColorstr='#fc8035',GradientType=0 );
+    background: linear-gradient(top, #fb6104 0%,#fc8035 100%);
+}
+
+.question .question-description #answer-form input.submit {
+    margin-top: 0px;
+}
+
+.question p.best, .answer p.best {
+    background: url(../images/rosette.png) no-repeat top left;
+    padding-left: 20px;
+}
+
+.question p.best:before, .answer p.best:before {
+    content: none !important;
+}
diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index dc1e401ac7..e40f5f85c6 100644
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -1103,81 +1103,6 @@ td.entity_profile {
     -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
 }
 
-/* QnA */
-
-.question div.question-description {
-    font-size: 1em;
-    line-height: 1.36em;
-    margin-top: 0px;
-    opacity: 1;
-}
-
-.question div.answer-content, .qna-full-question div.answer-content {
-    font-size: 1em;
-    opacity: 1;
-}
-
-.qna-dummy-placeholder input, .question #qna-answer, .qna-full-question #qna-answer {
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    -moz-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-    -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
-}
-
-.question-description input.submit, .answer-content input.submit {
-    height: auto;
-    padding: 0px 10px;
-    margin: 6px 0px 10px 0px;
-    color:#fff;
-    font-weight: bold;
-    text-transform: uppercase;
-    font-size: 1.1em;
-    text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2);
-    border: 1px solid #d7621c;
-    border-radius: 4px;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-    background: #FB6104;
-    background: -moz-linear-gradient(top, #ff9d63 0%, #fb6104 100%);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ff9d63), color-stop(100%,#fb6104));
-    background: -webkit-linear-gradient(top, #ff9d63 0%,#fb6104 100%);
-    background: -o-linear-gradient(top, #ff9d63 0%,#fb6104 100%);
-    background: -ms-linear-gradient(top, #ff9d63 0%,#fb6104 100%);
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff9d63', endColorstr='#fb6104',GradientType=0 );
-    background: linear-gradient(top, #ff9d63 0%,#fb6104 100%);
-}
-
-#qna-answer-submit {
-    min-width: 100px;
-}
-
-.question .question-description input.submit:hover, .question .answer-content input.submit:hover {
-    text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.6);
-    background: #ff9d63;
-    background: -moz-linear-gradient(top, #fb6104 0%, #fc8035 100%);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fb6104), color-stop(100%,#fc8035));
-    background: -webkit-linear-gradient(top, #fb6104 0%,#fc8035 100%);
-    background: -o-linear-gradient(top, #fb6104 0%,#fc8035 100%);
-    background: -ms-linear-gradient(top, #fb6104 0%,#fc8035 100%);
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fb6104', endColorstr='#fc8035',GradientType=0 );
-    background: linear-gradient(top, #fb6104 0%,#fc8035 100%);
-}
-
-.question .question-description #answer-form input.submit {
-    margin-top: 0px;
-}
-
-.question p.best, .answer p.best {
-    background: url(../images/rosette.png) no-repeat top left;
-    padding-left: 20px;
-}
-
-.question p.best:before, .answer p.best:before {
-    content: none !important;
-}
-
 /* Poll specific styles */
 
 .notice div.poll-content {