diff --git a/themes/metro/scss/_alert.scss b/themes/metro/scss/_alert.scss
new file mode 100644
index 0000000000..fcda0f288f
--- /dev/null
+++ b/themes/metro/scss/_alert.scss
@@ -0,0 +1,53 @@
+.alert {
+  text-align: $left;
+
+  a {
+    text-decoration: underline;
+  }
+
+  h1 {
+    margin-bottom: 0.2em;
+  }
+}
+
+.alert-primary {
+  color: $button-color;
+  background-color: $blue-header;
+  background-image: none;
+
+  a {
+    color: $button-color;
+  }
+
+  h1 {
+    color: $navi-color;
+  }
+}
+
+.alert-success {
+  color: $button-color;
+  background-color: $browse-success-color;
+  background-image: none;
+
+  a {
+    color: $button-color;
+  }
+
+  h1 {
+    color: $navi-color;
+  }
+}
+
+.alert-danger {
+  color: $button-color;
+  background-color: $browse-warning-color;
+  background-image: none;
+
+  a {
+    color: $button-color;
+  }
+
+  h1 {
+    color: $navi-color;
+  }
+}
diff --git a/themes/metro/scss/_card.scss b/themes/metro/scss/_card.scss
new file mode 100644
index 0000000000..27fc2f200d
--- /dev/null
+++ b/themes/metro/scss/_card.scss
@@ -0,0 +1,9 @@
+.card-header {
+  font-size: 2.8em;
+  font-family: $font-family-light;
+  padding: 0;
+}
+
+.card-body ul {
+  padding-#{$left}: 0;
+}
diff --git a/themes/metro/scss/_common.scss b/themes/metro/scss/_common.scss
index f3567ef43f..29c6f7ed74 100644
--- a/themes/metro/scss/_common.scss
+++ b/themes/metro/scss/_common.scss
@@ -4145,69 +4145,3 @@ body {
     float: left;
   }
 }
-
-// Bootstrap
-
-.card-header {
-  font-size: 2.8em;
-  font-family: $font-family-light;
-  padding: 0;
-}
-
-.card-body ul {
-  padding-#{$left}: 0;
-}
-
-.alert {
-  text-align: $left;
-
-  a {
-    text-decoration: underline;
-  }
-
-  h1 {
-    margin-bottom: 0.2em;
-  }
-}
-
-.alert-primary {
-  color: $button-color;
-  background-color: $blue-header;
-  background-image: none;
-
-  a {
-    color: $button-color;
-  }
-
-  h1 {
-    color: $navi-color;
-  }
-}
-
-.alert-success {
-  color: $button-color;
-  background-color: $browse-success-color;
-  background-image: none;
-
-  a {
-    color: $button-color;
-  }
-
-  h1 {
-    color: $navi-color;
-  }
-}
-
-.alert-danger {
-  color: $button-color;
-  background-color: $browse-warning-color;
-  background-image: none;
-
-  a {
-    color: $button-color;
-  }
-
-  h1 {
-    color: $navi-color;
-  }
-}
diff --git a/themes/metro/scss/theme.scss b/themes/metro/scss/theme.scss
index 11389ab0ce..fa9e8c4948 100644
--- a/themes/metro/scss/theme.scss
+++ b/themes/metro/scss/theme.scss
@@ -11,3 +11,5 @@
 @import "jqplot";
 @import "resizable-menu";
 @import "icons";
+@import "card";
+@import "alert";
diff --git a/themes/original/scss/_alert.scss b/themes/original/scss/_alert.scss
new file mode 100644
index 0000000000..a7a5a688e2
--- /dev/null
+++ b/themes/original/scss/_alert.scss
@@ -0,0 +1,46 @@
+.alert {
+  text-align: $left;
+
+  @if $direction == rtl {
+    padding: 0.1em 40px 0.1em 0.1em;
+  } @else {
+    padding: 0.1em 0.1em 0.1em 40px;
+  }
+
+  h1 {
+    border-bottom: 2px solid;
+  }
+}
+
+.alert-primary {
+  color: #000;
+  background-color: #ffd;
+  background-image: none;
+  border-color: #ffd700;
+
+  h1 {
+    border-color: #ffd700;
+  }
+}
+
+.alert-success {
+  color: #000;
+  background-color: #f0fff0;
+  background-image: none;
+  border-color: #0f0;
+
+  h1 {
+    border-color: #0f0;
+  }
+}
+
+.alert-danger {
+  color: #f00;
+  background-color: #ffc;
+  background-image: none;
+  border-color: #f00;
+
+  h1 {
+    border-color: #f00;
+  }
+}
diff --git a/themes/original/scss/_card.scss b/themes/original/scss/_card.scss
new file mode 100644
index 0000000000..1a8c08577c
--- /dev/null
+++ b/themes/original/scss/_card.scss
@@ -0,0 +1,13 @@
+.card {
+  border-top: none;
+  border-bottom: none;
+  border-#{$right}: none;
+}
+
+.card-header {
+  padding-top: 0.1em;
+  padding-bottom: 0.1em;
+  font-weight: bold;
+  font-size: 120%;
+  border: 0;
+}
diff --git a/themes/original/scss/_common.scss b/themes/original/scss/_common.scss
index 8f29533002..7e92c04437 100644
--- a/themes/original/scss/_common.scss
+++ b/themes/original/scss/_common.scss
@@ -3679,66 +3679,3 @@ body {
 #filter_query_text {
   vertical-align: baseline;
 }
-
-// Bootstrap
-
-.card {
-  border-top: none;
-  border-bottom: none;
-  border-#{$right}: none;
-}
-
-.card-header {
-  padding-top: 0.1em;
-  padding-bottom: 0.1em;
-  font-weight: bold;
-  font-size: 120%;
-  border: 0;
-}
-
-.alert {
-  text-align: $left;
-
-  @if $direction == rtl {
-    padding: 0.1em 40px 0.1em 0.1em;
-  } @else {
-    padding: 0.1em 0.1em 0.1em 40px;
-  }
-
-  h1 {
-    border-bottom: 2px solid;
-  }
-}
-
-.alert-primary {
-  color: #000;
-  background-color: #ffd;
-  background-image: none;
-  border-color: #ffd700;
-
-  h1 {
-    border-color: #ffd700;
-  }
-}
-
-.alert-success {
-  color: #000;
-  background-color: #f0fff0;
-  background-image: none;
-  border-color: #0f0;
-
-  h1 {
-    border-color: #0f0;
-  }
-}
-
-.alert-danger {
-  color: #f00;
-  background-color: #ffc;
-  background-image: none;
-  border-color: #f00;
-
-  h1 {
-    border-color: #f00;
-  }
-}
diff --git a/themes/original/scss/theme.scss b/themes/original/scss/theme.scss
index 1e5d7a5295..ad12db90b0 100644
--- a/themes/original/scss/theme.scss
+++ b/themes/original/scss/theme.scss
@@ -11,3 +11,5 @@
 @import "../../pmahomme/scss/jqplot";
 @import "../../pmahomme/scss/resizable-menu";
 @import "icons";
+@import "card";
+@import "alert";
diff --git a/themes/pmahomme/scss/_alert.scss b/themes/pmahomme/scss/_alert.scss
new file mode 100644
index 0000000000..ea27bb141b
--- /dev/null
+++ b/themes/pmahomme/scss/_alert.scss
@@ -0,0 +1,63 @@
+.alert {
+  text-align: $left;
+  -moz-box-shadow: 0 1px 1px #fff inset;
+  -webkit-box-shadow: 0 1px 1px #fff inset;
+  box-shadow: 0 1px 1px #fff inset;
+
+  @if $direction == rtl {
+    background-position: 99% 50%;
+    padding: 10px 35px 10px 10px;
+  } @else {
+    background-position: 10px 50%;
+    padding: 10px 10px 10px 10px;
+  }
+
+  a {
+    text-decoration: underline;
+  }
+
+  h1 {
+    border-bottom: 2px solid;
+  }
+}
+
+.alert-primary {
+  color: #000;
+  background-color: #e8eef1;
+  background-image: none;
+  border-color: #3a6c7e;
+
+  h1 {
+    border-color: #ffb10a;
+  }
+}
+
+.alert-success {
+  color: #000;
+  background-color: #ebf8a4;
+  background-image: none;
+  border-color: #a2d246;
+
+  h1 {
+    border-color: #0f0;
+  }
+}
+
+.alert-danger {
+  color: #000;
+  background-color: pink;
+  background-image: none;
+  border-color: #333;
+
+  h1 {
+    border-color: #f00;
+  }
+}
+
+.result_query .alert {
+  margin-bottom: 0;
+  border-bottom: none !important;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
+  padding-bottom: 5px;
+}
diff --git a/themes/pmahomme/scss/_buttons.scss b/themes/pmahomme/scss/_buttons.scss
new file mode 100644
index 0000000000..31fbdf5fa6
--- /dev/null
+++ b/themes/pmahomme/scss/_buttons.scss
@@ -0,0 +1,14 @@
+.btn-primary {
+  font-weight: $font-weight-bold;
+}
+
+.btn-primary,
+.btn-secondary {
+  border-color: #aaa;
+  text-shadow: 0 1px 0 #fff;
+  background-image: linear-gradient(#f8f8f8, #d8d8d8);
+
+  &:hover {
+    background-image: linear-gradient(#fff, #ddd);
+  }
+}
diff --git a/themes/pmahomme/scss/_card.scss b/themes/pmahomme/scss/_card.scss
new file mode 100644
index 0000000000..597258c82d
--- /dev/null
+++ b/themes/pmahomme/scss/_card.scss
@@ -0,0 +1,21 @@
+.card {
+  @if $direction == rtl {
+    -moz-box-shadow: -2px 2px 5px #ccc;
+    -webkit-box-shadow: -2px 2px 5px #ccc;
+    box-shadow: -2px 2px 5px #ccc;
+  } @else {
+    -moz-box-shadow: 2px 2px 5px #ccc;
+    -webkit-box-shadow: 2px 2px 5px #ccc;
+    box-shadow: 2px 2px 5px #ccc;
+  }
+}
+
+.card-header {
+  padding-top: 0.1em;
+  padding-bottom: 0.1em;
+  font-size: 1.6em;
+  text-shadow: 0 1px 0 #777;
+  -moz-box-shadow: 1px 1px 15px #999 inset;
+  -webkit-box-shadow: 1px 1px 15px #999 inset;
+  box-shadow: 1px 1px 15px #999 inset;
+}
diff --git a/themes/pmahomme/scss/_common.scss b/themes/pmahomme/scss/_common.scss
index 71da86f985..9616ed24a0 100644
--- a/themes/pmahomme/scss/_common.scss
+++ b/themes/pmahomme/scss/_common.scss
@@ -1913,19 +1913,9 @@ div.sqlvalidate {
   direction: ltr;
 }
 
-.result_query {
-  div.sqlOuter {
-    background: $bg-one;
-    text-align: $left;
-  }
-
-  .alert {
-    margin-bottom: 0;
-    border-bottom: none !important;
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 0;
-    padding-bottom: 5px;
-  }
+.result_query div.sqlOuter {
+  background: $bg-one;
+  text-align: $left;
 }
 
 #PMA_slidingMessage code.sql,
@@ -4080,98 +4070,3 @@ body .ui-dialog {
 #filter_query_text {
   vertical-align: baseline;
 }
-
-// Bootstrap
-
-.btn-primary {
-  font-weight: $font-weight-bold;
-}
-
-.btn-primary,
-.btn-secondary {
-  border-color: #aaa;
-  text-shadow: 0 1px 0 #fff;
-  background-image: linear-gradient(#f8f8f8, #d8d8d8);
-
-  &:hover {
-    background-image: linear-gradient(#fff, #ddd);
-  }
-}
-
-.card {
-  @if $direction == rtl {
-    -moz-box-shadow: -2px 2px 5px #ccc;
-    -webkit-box-shadow: -2px 2px 5px #ccc;
-    box-shadow: -2px 2px 5px #ccc;
-  } @else {
-    -moz-box-shadow: 2px 2px 5px #ccc;
-    -webkit-box-shadow: 2px 2px 5px #ccc;
-    box-shadow: 2px 2px 5px #ccc;
-  }
-}
-
-.card-header {
-  padding-top: 0.1em;
-  padding-bottom: 0.1em;
-  font-size: 1.6em;
-  text-shadow: 0 1px 0 #777;
-  -moz-box-shadow: 1px 1px 15px #999 inset;
-  -webkit-box-shadow: 1px 1px 15px #999 inset;
-  box-shadow: 1px 1px 15px #999 inset;
-}
-
-.alert {
-  text-align: $left;
-  -moz-box-shadow: 0 1px 1px #fff inset;
-  -webkit-box-shadow: 0 1px 1px #fff inset;
-  box-shadow: 0 1px 1px #fff inset;
-
-  @if $direction == rtl {
-    background-position: 99% 50%;
-    padding: 10px 35px 10px 10px;
-  } @else {
-    background-position: 10px 50%;
-    padding: 10px 10px 10px 10px;
-  }
-
-  a {
-    text-decoration: underline;
-  }
-
-  h1 {
-    border-bottom: 2px solid;
-  }
-}
-
-.alert-primary {
-  color: #000;
-  background-color: #e8eef1;
-  background-image: none;
-  border-color: #3a6c7e;
-
-  h1 {
-    border-color: #ffb10a;
-  }
-}
-
-.alert-success {
-  color: #000;
-  background-color: #ebf8a4;
-  background-image: none;
-  border-color: #a2d246;
-
-  h1 {
-    border-color: #0f0;
-  }
-}
-
-.alert-danger {
-  color: #000;
-  background-color: pink;
-  background-image: none;
-  border-color: #333;
-
-  h1 {
-    border-color: #f00;
-  }
-}
diff --git a/themes/pmahomme/scss/theme.scss b/themes/pmahomme/scss/theme.scss
index e78c587af4..0120bcf889 100644
--- a/themes/pmahomme/scss/theme.scss
+++ b/themes/pmahomme/scss/theme.scss
@@ -11,3 +11,6 @@
 @import "jqplot";
 @import "resizable-menu";
 @import "icons";
+@import "buttons";
+@import "card";
+@import "alert";