diff --git a/js/tabler.js b/js/tabler.js
index 2c5161565..c700502bb 100644
--- a/js/tabler.js
+++ b/js/tabler.js
@@ -42,8 +42,17 @@ $(document).ready(function () {
 		return false;
 	});
 
-	// $('[data-toggle="tooltip"]').tooltip();
-	// $('[data-toggle="popover"]').popover();
+	$('[data-toggle="tooltip"]').tooltip();
+
+	/*
+	Popover
+	 */
+	var popoverTriggerList = [].slice.call(document.querySelectorAll('[data-toggle="popover"]'))
+	var popoverList = popoverTriggerList.map(function (popoverTriggerEl) {
+		return new bootstrap.Popover(popoverTriggerEl, {
+			autoHide: true
+		})
+	});
 
 	/*
 	  CountUp
diff --git a/pages/_docs/form-elements.md b/pages/_docs/form-elements.md
index ba61dcca5..895afd124 100644
--- a/pages/_docs/form-elements.md
+++ b/pages/_docs/form-elements.md
@@ -66,7 +66,7 @@ bootstrap-link: components/forms/
 ### Textarea
 {% example %}
 <div class="mb-2">
-   <label class="form-label">Textarea <span class="float-right text-muted">56/100</span></label>
+   <label class="form-label">Textarea <span class="form-label-description">56/100</span></label>
    <textarea class="form-control" name="example-textarea-input" rows="6" placeholder="Content..">Oh! Come and see the violence inherent in the system! Help, help, I'm being repressed! We shall say 'Ni' again to you, if you do not appease us. I'm not a witch. I'm not a witch. Camelot!</textarea>
 </div>
 {% endexample %}
diff --git a/pages/_includes/forms/form-elements-1.html b/pages/_includes/forms/form-elements-1.html
index 68802fd19..1f2c13950 100644
--- a/pages/_includes/forms/form-elements-1.html
+++ b/pages/_includes/forms/form-elements-1.html
@@ -20,7 +20,7 @@
           value="Well, how'd you become king, then?" readonly>
 </div>
 <div class="mb-3">
-   <label class="form-label">Textarea <span class="float-right text-muted">56/100</span></label>
+   <label class="form-label">Textarea <span class="form-label-description">56/100</span></label>
    <textarea class="form-control" name="example-textarea-input" rows="6" placeholder="Content..">Oh! Come and see the violence inherent in the system! Help, help, I'm being repressed! We shall say 'Ni' again to you, if you do not appease us. I'm not a witch. I'm not a witch. Camelot!</textarea>
 </div>
 
@@ -60,7 +60,7 @@
          <input type="text" class="form-control" placeholder="Search for&hellip;">
       </div>
       <div class="col-auto align-self-center">
-         <span class="form-help" data-toggle="popover" data-placement="top" data-content="<p>ZIP Code must be US or CDN format. You can use an extended ZIP+4 code to determine address more accurately.</p><p class='mb-0'><a href=''>USP ZIP codes lookup tools</a></p>">?</span>
+         <span class="form-help" data-toggle="popover" data-placement="top" data-content="<p>ZIP Code must be US or CDN format. You can use an extended ZIP+4 code to determine address more accurately.</p><p class='mb-0'><a href='#'>USP ZIP codes lookup tools</a></p>" data-html="true">?</span>
       </div>
    </div>
 </div>
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 827542c67..9392f6402 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -46,8 +46,11 @@ $cyan: #17a2b8 !default;
 $black: #000000 !default;
 $white: #ffffff !default;
 
-$text-muted: $gray-700 !default;
-$border-color: $gray-400 !default;
+$body-bg: $light !default;
+$body-color: $dark !default;
+
+$text-muted: mix($body-color, #fff, 64%) !default;
+$border-color: rgba($body-color, .16) !default;
 $hover-bg: $gray-200 !default;
 $active-bg: rgba($blue, .06) !default;
 
@@ -58,9 +61,6 @@ $info: $azure !default;
 $warning: $yellow !default;
 $danger: $red !default;
 
-$body-bg: $light !default;
-$body-color: $dark !default;
-
 $social-colors: (
   "facebook": #3b5998,
   "twitter": #1da1f2,
@@ -264,6 +264,9 @@ $navbar-bg: $white !default;
 $navbar-height: 3.5rem !default;
 $navbar-border-color: $border-color !default;
 
+//popover
+$popover-border-color: $border-color !default;
+
 //nav
 //$nav-link-padding-y: 1rem !default;
 
@@ -333,7 +336,9 @@ $form-check-padding-left: $form-check-input-width + .5rem !default;
 $form-check-input-bg: $white !default;
 $form-check-input-border: 1px solid $border-color !default;
 $form-check-input-border-radius: $border-radius !default;
-$form-check-input-checked-bg-size: .75rem !default;
+$form-check-input-checked-bg-size: .8rem !default;
+
+$form-check-input-checked-border-color: $border-color !default;
 
 $form-switch-width: 1.75rem !default;
 $form-switch-padding-left: $form-switch-width + .5rem !default;
@@ -360,8 +365,6 @@ $payment-sizes: (
   "xl": 4rem
 ) !default;
 
-
-
 $enable-social-colors: true !default;
 $enable-ghost-buttons: true !default;
 $enable-extra-colors: true !default;
diff --git a/scss/tabler.scss b/scss/tabler.scss
index a995438c6..058ac95ed 100644
--- a/scss/tabler.scss
+++ b/scss/tabler.scss
@@ -42,6 +42,7 @@
 @import "ui/nav";
 @import "ui/stars";
 @import "ui/pagination";
+@import "ui/popovers";
 @import "ui/progress";
 @import "ui/ribbons";
 @import "ui/stamps";
diff --git a/scss/ui/_forms.scss b/scss/ui/_forms.scss
index 3a3be7f81..38d47342f 100644
--- a/scss/ui/_forms.scss
+++ b/scss/ui/_forms.scss
@@ -4,6 +4,9 @@ textarea {
   }
 }
 
+/**
+Form label
+ */
 .form-label {
   font-size: $h4-font-size;
   font-weight: $font-weight-bold;
@@ -11,6 +14,17 @@ textarea {
   margin-bottom: .5rem;
 }
 
+.form-label-description {
+  float: right;
+  font-weight: $font-weight-normal;
+  color: $text-muted;
+  line-height: $line-height-base * (100%/$small-font-size);
+  font-size: $small-font-size ;
+}
+
+/**
+Form control
+ */
 .form-control {
   &:-webkit-autofill {
     box-shadow: 0 0 0 1000px #fff inset;
@@ -53,17 +67,19 @@ textarea {
 Form help
  */
 .form-help {
-  display: inline-block;
-  width: 1rem;
-  height: 1rem;
-  font-size: $h5-font-size;
-  line-height: 1rem;
+  display: inline-flex;
+  font-weight: 600;
+  align-items: center;
+  justify-content: center;
+  width: 1.125rem;
+  height: 1.125rem;
+  font-size: .75rem;
   color: $text-muted;
   text-align: center;
   text-decoration: none;
   cursor: pointer;
   user-select: none;
-  background: $gray-100;
+  background: $gray-200;
   border-radius: 50%;
   transition: .3s background-color, .3s color;
 
@@ -73,3 +89,24 @@ Form help
     background: $primary;
   }
 }
+
+/**
+Form switch
+ */
+.form-check-input {
+  color: $form-check-input-checked-bg-color;
+
+  &:checked {
+    background-color: currentColor;
+  }
+}
+
+.form-check .form-check-input:not(:checked) ~ .form-check-label {
+  color: $text-muted;
+}
+
+/**
+Input group
+ */
+.input-group-prepend .input-group-text { border-right: 0; }
+.input-group-append .input-group-text { border-left: 0; }
diff --git a/scss/ui/_popovers.scss b/scss/ui/_popovers.scss
new file mode 100644
index 000000000..b0912ae5c
--- /dev/null
+++ b/scss/ui/_popovers.scss
@@ -0,0 +1,2 @@
+.popover {
+}