diff --git a/projects/common-map/src/fm-map/components/map/map.component.scss b/projects/common-map/src/fm-map/components/map/map.component.scss
index ff6893a..dec735c 100644
--- a/projects/common-map/src/fm-map/components/map/map.component.scss
+++ b/projects/common-map/src/fm-map/components/map/map.component.scss
@@ -195,7 +195,7 @@ timespan.menuVisible {
   width: 4rem;
   overflow: hidden;
   text-overflow: ellipsis;
-  color: theme-color();
+  color: $primary;
 }
 
 .shortcut-icon > .farm-icon {
diff --git a/projects/common/src/fm/components/resumable-file-upload/resumable-file-upload.component.scss b/projects/common/src/fm/components/resumable-file-upload/resumable-file-upload.component.scss
index 3369815..3e520a4 100644
--- a/projects/common/src/fm/components/resumable-file-upload/resumable-file-upload.component.scss
+++ b/projects/common/src/fm/components/resumable-file-upload/resumable-file-upload.component.scss
@@ -76,7 +76,7 @@ div.card-header span.fa {
   }
 
 .upload-file.busy > div > span.fa-times {
-  color: theme-color("danger");
+  color: $danger;
   width: 20px;
   display: inline-block;
   vertical-align: middle;
@@ -94,7 +94,7 @@ div.card-header span.fa {
   }
 
   .upload-file > div.errormessage {
-    color: theme-color("danger");
+    color: $danger;
     display: none;
   }
 
diff --git a/src/app/landingpage/landingpage.component.html b/src/app/landingpage/landingpage.component.html
index 5d5d7de..3e7654d 100644
--- a/src/app/landingpage/landingpage.component.html
+++ b/src/app/landingpage/landingpage.component.html
@@ -45,21 +45,21 @@
 </section>
 <section class="showcase">
     <div class="container-fluid p-0">
-        <div class="row no-gutters">
+        <div class="row g-0">
             <div class="col-lg-6 order-lg-2 text-white showcase-img" style="background-image:url('/images/bg-showcase-1.jpg');"><span></span></div>
             <div class="col-lg-6 my-auto order-lg-1 showcase-text">
                 <h2>Fully Responsive Design</h2>
                 <p class="lead mb-0">When you use a theme created with Bootstrap, you know that the theme will look great on any device, whether it's a phone, tablet, or desktop the page will behave responsively!</p>
             </div>
         </div>
-        <div class="row no-gutters">
+        <div class="row g-0">
             <div class="col-lg-6 text-white showcase-img" style="background-image:url('/images/bg-showcase-2.jpg');"><span></span></div>
             <div class="col-lg-6 my-auto order-lg-1 showcase-text">
                 <h2>Updated For Bootstrap 4</h2>
                 <p class="lead mb-0">Newly improved, and full of great utility classes, Bootstrap 4 is leading the way in mobile responsive web development! All of the themes are now using Bootstrap 4!</p>
             </div>
         </div>
-        <div class="row no-gutters">
+        <div class="row g-0">
             <div class="col-lg-6 order-lg-2 text-white showcase-img" style="background-image:url('/images/bg-showcase-3.jpg');"><span></span></div>
             <div class="col-lg-6 my-auto order-lg-1 showcase-text">
                 <h2>Easy to Use &amp;&nbsp;Customize</h2>
diff --git a/src/app/menu/menu.component.scss b/src/app/menu/menu.component.scss
index ddc3ef1..2d5f69f 100644
--- a/src/app/menu/menu.component.scss
+++ b/src/app/menu/menu.component.scss
@@ -1,3 +1,5 @@
+@import "~bootstrap/scss/bootstrap.scss";
+
 .menu-card {
     padding-left:7px;
     padding-right:7px;
@@ -27,7 +29,7 @@
     width: 4rem;
     overflow: hidden;
     text-overflow: ellipsis;
-    color: theme-color();
+    color: $primary;
   }
   
   .shortcut-icon > .farm-icon {