diff --git a/packages/pagetop-bootsier/src/lib.rs b/packages/pagetop-bootsier/src/lib.rs
index d08d1aac..548a0a8e 100644
--- a/packages/pagetop-bootsier/src/lib.rs
+++ b/packages/pagetop-bootsier/src/lib.rs
@@ -32,11 +32,10 @@ impl ThemeTrait for Bootsier {
         ]
     }
 
-    #[rustfmt::skip]
-    fn builtin_classes(&self, builtin: ThemeBuiltInClasses) -> Option<&str> {
+    fn builtin_classes(&self, builtin: ThemeBuiltInClasses) -> Option<String> {
         match builtin {
-            ThemeBuiltInClasses::RegionContainer => Some("container"),
-            _ => None,
+            ThemeBuiltInClasses::RegionContainer => Some(String::from("container")),
+            _ => Some(builtin.to_string()),
         }
     }
 
diff --git a/packages/pagetop-bulmix/src/lib.rs b/packages/pagetop-bulmix/src/lib.rs
index 6ce7c87d..fc38e70c 100644
--- a/packages/pagetop-bulmix/src/lib.rs
+++ b/packages/pagetop-bulmix/src/lib.rs
@@ -16,13 +16,12 @@ impl PackageTrait for Bulmix {
 
 impl ThemeTrait for Bulmix {
     #[rustfmt::skip]
-    fn builtin_classes(&self, builtin: ThemeBuiltInClasses) -> Option<&str> {
+    fn builtin_classes(&self, builtin: ThemeBuiltInClasses) -> Option<String> {
         match builtin {
-            ThemeBuiltInClasses::BodyContainer    => Some("container"),
-            ThemeBuiltInClasses::RegionContainer  => Some("container"),
-            ThemeBuiltInClasses::ContentContainer => Some("container"),
-            ThemeBuiltInClasses::SkipToContent    => Some("skip__to_content"),
-            _ => None,
+            ThemeBuiltInClasses::BodyWrapper     => Some(String::from("container")),
+            ThemeBuiltInClasses::ContentWrapper  => Some(String::from("container")),
+            ThemeBuiltInClasses::RegionContainer => Some(String::from("container")),
+            _ => Some(builtin.to_string()),
         }
     }
 
diff --git a/src/locale/en-US/theme.ftl b/src/locale/en-US/theme.ftl
index 97076794..6b3cb0e8 100644
--- a/src/locale/en-US/theme.ftl
+++ b/src/locale/en-US/theme.ftl
@@ -1,7 +1,8 @@
 header = Header
 pagetop = Page Top
 content = Content
-sidebar = Sidebar
+sidebar_left = Sidebar Left
+sidebar_right = Sidebar Right
 footer = Footer
 
 skip_to_content = Skip to main content (Press Enter)
diff --git a/src/locale/es-ES/theme.ftl b/src/locale/es-ES/theme.ftl
index 202bd402..fb5caacd 100644
--- a/src/locale/es-ES/theme.ftl
+++ b/src/locale/es-ES/theme.ftl
@@ -1,7 +1,8 @@
 header = Cabecera
 pagetop = Superior
 content = Contenido
-sidebar = Barra lateral
+sidebar_left = Barra lateral izquierda
+sidebar_right = Barra lateral derecha
 footer = Pie
 
 skip_to_content = Ir al contenido principal (Pulsar Intro)
diff --git a/static/base/css/inception.css b/static/base/css/inception.css
index 74d97fe4..f3e7cd3d 100644
--- a/static/base/css/inception.css
+++ b/static/base/css/inception.css
@@ -73,28 +73,36 @@ a:active {
 
 /* LAYOUT */
 
-#header > .region__inner,
-.content__inner,
-#footer > .region__inner {
+.body__wrapper {
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+}
+#header,
+#pagetop,
+.content__wrapper,
+#footer {
+	width: 100%;
+	max-width: var(--val-max-width);
+	background: var(--val-color--white);
+}
+#header > .region__content /*,
+#pagetop > .region__content */ {
+	margin: var(--val-gap);
+}
+#footer {
+	max-width: 100%;
+	background: linear-gradient(180deg, var(--val-color--gray-5) 0%, var(--val-color--gray-10) 100%);
+}
+#footer > .region__content {
 	width: 100%;
 	max-width: var(--val-max-width);
 	margin: 0 auto;
-}
-
-#header {
-	background: var(--val-color--white);
-}
-.content__inner {
-	background: var(--val-color--white);
-}
-#footer {
-	background: linear-gradient(180deg, var(--val-color--gray-5) 0%, var(--val-color--gray-10) 100%);
-}
-#footer > .region__inner {
 	color: var(--val-color--gray-65);
 	background: var(--val-color--gray-20);
 	padding: calc(3 * var(--val-gap)) 0 calc(12 * var(--val-gap));
 }
-#footer > .region__inner a {
+#footer > .region__content a {
 	color: var(--val-color--white);
 }
diff --git a/static/base/css/root.css b/static/base/css/root.css
index 56a420c0..bc55a443 100644
--- a/static/base/css/root.css
+++ b/static/base/css/root.css
@@ -200,7 +200,7 @@
 	--val-menu--color-border: rgba(0, 0, 0, 0.1);
 	--val-menu--color-shadow: rgba(0, 0, 0, 0.06);
 	--val-menu--line-padding: 0.625rem;
-	--val-menu--line-height: 1.875rem;
+	--val-menu--line-height: calc(1.875rem + 1px);
 	--val-menu--item-height: calc(var(--val-menu--line-padding) + var(--val-menu--line-height));
 	--val-menu--item-width-min: 14rem;
 	--val-menu--item-width-max: 20rem;