diff --git a/UI/data/themes/Acri.qss b/UI/data/themes/Acri.qss
index bce32d1fb..ca9637ee5 100644
--- a/UI/data/themes/Acri.qss
+++ b/UI/data/themes/Acri.qss
@@ -43,6 +43,7 @@ QWidget {
 	font-family: "Open Sans", "Tahoma", "Arial", sans-serif;
 	font-size: 12px;
 	padding: 4px;
+	overflow: auto;
 }
 
 #menubar {
@@ -79,6 +80,14 @@ QWidget::disabled {
 	color: #484848;
 }
 
+* [themeID="error"] {
+	color: #d91740;
+}
+
+* [themeID="warning"] {
+	color: #d9af17;
+}
+
 /* Dropdown menus, Scenes box, Sources box */
 QAbstractItemView {
 	background-color: #181819;
@@ -502,10 +511,12 @@ QPushButton {
 
 QPushButton::flat {
 	background-color: rgb(24,24,25);
+	border: none;
 }
 
 QPushButton:checked {
-	background-color: #202b52;
+	background-color: #581624;
+	border-color: #84162d;
 }
 
 QPushButton:hover {
@@ -522,6 +533,11 @@ QPushButton:disabled {
 	background-color: #1a1a1b;
 }
 
+QPushButton::flat:hover,
+QPushButton::flat:disabled {
+	border: none;
+}
+
 /* Progress Bar */
 
 QProgressBar {
@@ -835,13 +851,6 @@ FocusList::item {
 	padding: 0px 2px;
 }
 
-#transitionsContainer QPushButton,
-#mixerDock QPushButton,
-#effectWidget QPushButton,
-#asyncWidget QPushButton {
-	border: none;
-}
-
 #fpsTypes {
 	padding: 0px;
 }