diff --git a/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--login.html.twig b/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--login.html.twig
index d11e7cadc3343d777fbb5dfab9fe20fcbdfc98cd..4a8248de28428c2a702540b866cde6d4a0b2289c 100644
--- a/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--login.html.twig
+++ b/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--login.html.twig
@@ -1,6 +1,15 @@
+{#
+/**
+ * @file
+ * Page user login.
+ */
+#}
+
+{% extends  "page.html.twig" %}
+
 {# Main #}
 {% block main %}
-<div role="main" class="main-container container">
+<div role="main" class="main-container {{ container }}">
   <div class="row">
     <div id="auth-box" class="login col-xs-10 col-xs-offset-1 col-sm-4 col-sm-offset-4">
       <div id="top-part">
diff --git a/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--password.html.twig b/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--password.html.twig
index 0691f3e7d7277cb9f38c062f5b4376fca51fe0b0..a8bb35e60cd9b4e40f47a8f5da197d89eb540468 100644
--- a/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--password.html.twig
+++ b/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--password.html.twig
@@ -1,6 +1,15 @@
+{#
+/**
+ * @file
+ * Page user password.
+ */
+#}
+
+{% extends  "page.html.twig" %}
+
 {# Main #}
 {% block main %}
-<div role="main" class="main-container container">
+<div role="main" class="main-container {{ container }}">
   <div class="row">
     <div id="auth-box" class="login col-xs-10 col-xs-offset-1 col-sm-4 col-sm-offset-4">
       <div id="top-part">
diff --git a/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--register.html.twig b/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--register.html.twig
index be413799f205270e29179564bfaf3295528e3ba0..5f506056f1cfbe7bb64a13458e61efe6e2fd98e2 100644
--- a/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--register.html.twig
+++ b/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--register.html.twig
@@ -1,6 +1,15 @@
+{#
+/**
+ * @file
+ * Page user register.
+ */
+#}
+
+{% extends  "page.html.twig" %}
+
 {# Main #}
 {% block main %}
-<div role="main" class="main-container container">
+<div role="main" class="main-container {{ container }}">
   <div class="row">
     <div id="auth-box" class="login col-xs-10 col-xs-offset-1 col-sm-4 col-sm-offset-4">
       <div id="top-part">
diff --git a/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--reset.html.twig b/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--reset.html.twig
index 0691f3e7d7277cb9f38c062f5b4376fca51fe0b0..e4456a39c87dc36aacbb1f0a92642b4e42fb90af 100644
--- a/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--reset.html.twig
+++ b/themes/vartheme/VARTHEME_SUBTHEME/templates/betterlogin/page--user--reset.html.twig
@@ -1,6 +1,15 @@
+{#
+/**
+ * @file
+ * Page user reset.
+ */
+#}
+
+{% extends  "page.html.twig" %}
+
 {# Main #}
 {% block main %}
-<div role="main" class="main-container container">
+<div role="main" class="main-container {{ container }}">
   <div class="row">
     <div id="auth-box" class="login col-xs-10 col-xs-offset-1 col-sm-4 col-sm-offset-4">
       <div id="top-part">
diff --git a/themes/vartheme/templates/betterlogin/page--user--login.html.twig b/themes/vartheme/templates/betterlogin/page--user--login.html.twig
index 2aa9a020407569f2dcc05eb6c0d79a98f73a4dd0..92dc7d65cd97bc3133d56862e015ca2e0c72b2d2 100644
--- a/themes/vartheme/templates/betterlogin/page--user--login.html.twig
+++ b/themes/vartheme/templates/betterlogin/page--user--login.html.twig
@@ -1,6 +1,15 @@
+{#
+/**
+ * @file
+ * Page user login.
+ */
+#}
+
+{% extends  "page.html.twig" %}
+
 {# Main #}
 {% block main %}
-<div role="main" class="main-container container">
+<div role="main" class="main-container {{ container }}">
   <div class="row">
     <div id="auth-box" class="login col-xs-10 col-xs-offset-1 col-sm-4 col-sm-offset-4">
       <div id="top-part">
diff --git a/themes/vartheme/templates/betterlogin/page--user--password.html.twig b/themes/vartheme/templates/betterlogin/page--user--password.html.twig
index 9de0b54d5ea448f271010f6f4146b4ba1817fe16..ac7aa8ba0b79baf5f2bd82006301589c2706c8c0 100644
--- a/themes/vartheme/templates/betterlogin/page--user--password.html.twig
+++ b/themes/vartheme/templates/betterlogin/page--user--password.html.twig
@@ -1,6 +1,15 @@
+{#
+/**
+ * @file
+ * Page user password.
+ */
+#}
+
+{% extends  "page.html.twig" %}
+
 {# Main #}
 {% block main %}
-<div role="main" class="main-container container">
+<div role="main" class="main-container {{ container }}">
   <div class="row">
     <div id="auth-box" class="login col-xs-10 col-xs-offset-1 col-sm-4 col-sm-offset-4">
       <div id="top-part">
diff --git a/themes/vartheme/templates/betterlogin/page--user--register.html.twig b/themes/vartheme/templates/betterlogin/page--user--register.html.twig
index 9319faba52acd9bff1924f575122e715fa8c5901..1abf8246b9232eed2366a6403c6113fb0e47e4cb 100644
--- a/themes/vartheme/templates/betterlogin/page--user--register.html.twig
+++ b/themes/vartheme/templates/betterlogin/page--user--register.html.twig
@@ -1,6 +1,15 @@
+{#
+/**
+ * @file
+ * Page user register.
+ */
+#}
+
+{% extends  "page.html.twig" %}
+
 {# Main #}
 {% block main %}
-<div role="main" class="main-container container">
+<div role="main" class="main-container {{ container }}">
   <div class="row">
     <div id="auth-box" class="login col-xs-10 col-xs-offset-1 col-sm-4 col-sm-offset-4">
       <div id="top-part">
diff --git a/themes/vartheme/templates/betterlogin/page--user--reset.html.twig b/themes/vartheme/templates/betterlogin/page--user--reset.html.twig
index 9de0b54d5ea448f271010f6f4146b4ba1817fe16..0c4a568d91cfebc6c4d084746898a7e2ddda3db5 100644
--- a/themes/vartheme/templates/betterlogin/page--user--reset.html.twig
+++ b/themes/vartheme/templates/betterlogin/page--user--reset.html.twig
@@ -1,6 +1,15 @@
+{#
+/**
+ * @file
+ * Page user reset.
+ */
+#}
+
+{% extends  "page.html.twig" %}
+
 {# Main #}
 {% block main %}
-<div role="main" class="main-container container">
+<div role="main" class="main-container {{ container }}">
   <div class="row">
     <div id="auth-box" class="login col-xs-10 col-xs-offset-1 col-sm-4 col-sm-offset-4">
       <div id="top-part">
diff --git a/varbase.install b/varbase.install
index 2131fa3c9687423ad9d8d3de67f5e4651c001ebe..9d672248305e30a66e507b9d0f4b31b22c639dcb 100644
--- a/varbase.install
+++ b/varbase.install
@@ -542,12 +542,3 @@ function varbase_update_8042() {
     \Drupal::service('module_installer')->install(['settings_tray'], FALSE);
   }
 }
-
-/**
- * Enable Better Login module.
- */
-function varbase_update_8043() {
-  if (!\Drupal::moduleHandler()->moduleExists('betterlogin')) {
-    \Drupal::service('module_installer')->install(['betterlogin'], FALSE);
-  }
-}