diff --git a/layouts/uw-1-col/layout--uw-1-col.html.twig b/layouts/layout--uw-1-col.html.twig
similarity index 100%
rename from layouts/uw-1-col/layout--uw-1-col.html.twig
rename to layouts/layout--uw-1-col.html.twig
diff --git a/layouts/layout--uw-2-col.html.twig b/layouts/layout--uw-2-col.html.twig
new file mode 100644
index 0000000000000000000000000000000000000000..df321871bd87a3dd1fa085c23eefe03e28d59e49
--- /dev/null
+++ b/layouts/layout--uw-2-col.html.twig
@@ -0,0 +1,12 @@
+{%
+  set classes = [
+  'layout',
+  'layout--uw-2-col',
+  settings.column_class,
+]
+%}
+
+{% include '@layouts/layout/layout--2-col/layout--2-col.twig' with {
+  'classes': classes,
+  'content': content
+} %}
diff --git a/layouts/layout--uw-3-col.html.twig b/layouts/layout--uw-3-col.html.twig
new file mode 100644
index 0000000000000000000000000000000000000000..280ecd8eb655fcc338ad15b0ee64f8fba4915ec9
--- /dev/null
+++ b/layouts/layout--uw-3-col.html.twig
@@ -0,0 +1,12 @@
+{%
+  set classes = [
+  'layout',
+  'layout--uw-3-col',
+  settings.column_class,
+]
+%}
+
+{% include '@layouts/layout/layout--3-col/layout--3-col.twig' with {
+  'classes': classes,
+  'content': content,
+} %}
diff --git a/layouts/layout--uw-4-col.html.twig b/layouts/layout--uw-4-col.html.twig
new file mode 100644
index 0000000000000000000000000000000000000000..d099378cc3ee970a3da485af78f4287f8df2e75c
--- /dev/null
+++ b/layouts/layout--uw-4-col.html.twig
@@ -0,0 +1,12 @@
+{%
+  set classes = [
+  'layout',
+  'layout--uw-4-col',
+  settings.column_class,
+]
+%}
+
+{% include '@layouts/layout/layout--4-col/layout--4-col.twig' with {
+  'classes': classes,
+  'content': content,
+} %}
diff --git a/layouts/layout--uw-5-col.html.twig b/layouts/layout--uw-5-col.html.twig
new file mode 100644
index 0000000000000000000000000000000000000000..15bee1a9a7f90bb5bb5ab032984b9a2c4567c5ef
--- /dev/null
+++ b/layouts/layout--uw-5-col.html.twig
@@ -0,0 +1,12 @@
+{%
+  set classes = [
+  'layout',
+  'layout--uw-5-col',
+  settings.column_class,
+]
+%}
+
+{% include '@layouts/layout/layout--5-col/layout--5-col.twig' with {
+  'classes': classes,
+  'content': content,
+} %}
diff --git a/layouts/layout--uw-inverted-l-left.html.twig b/layouts/layout--uw-inverted-l-left.html.twig
new file mode 100644
index 0000000000000000000000000000000000000000..c833aea50ffd31a5460cebcf97f3e61e4e2d2f68
--- /dev/null
+++ b/layouts/layout--uw-inverted-l-left.html.twig
@@ -0,0 +1,12 @@
+{%
+  set classes = [
+  'layout',
+  'layout--uw-inverted-l-left',
+  settings.column_class,
+]
+%}
+
+{% include '@layouts/layout/layout--inverted-l-left/layout--inverted-l-left.twig' with {
+  'classes': classes,
+  'content': content,
+} %}
diff --git a/layouts/layout--uw-inverted-l-right.html.twig b/layouts/layout--uw-inverted-l-right.html.twig
new file mode 100644
index 0000000000000000000000000000000000000000..0bfd50c54286b78ced24bf0585f2df40d441e172
--- /dev/null
+++ b/layouts/layout--uw-inverted-l-right.html.twig
@@ -0,0 +1,12 @@
+{%
+  set classes = [
+  'layout',
+  'layout--uw-inverted-l-right',
+  settings.column_class,
+]
+%}
+
+{% include '@layouts/layout/layout--inverted-l-right/layout--inverted-l-right.twig' with {
+  'classes': classes,
+  'content': content,
+} %}
diff --git a/layouts/uw-1-col/uw-layout-1-col.css b/layouts/uw-1-col/uw-layout-1-col.css
deleted file mode 100644
index 93e5ed84991fccb1ad67920ad5a10de47d84d15f..0000000000000000000000000000000000000000
--- a/layouts/uw-1-col/uw-layout-1-col.css
+++ /dev/null
@@ -1,19 +0,0 @@
-.layout--uw-1-col {
-  display: grid;
-  grid-template-columns: 100%;
-}
-
-.layout--uw-1-col .layout__region--first {
-  grid-column: 1 / 2;
-}
-
-.path-dashboard .layout__region {
-  margin-right: 1rem;
-  margin-bottom: 1rem;
-}
-
-.path-dashboard .layout__region--wrapper {
-  box-shadow: none;
-  border: 1px solid #bfbfba;
-  padding: 1rem;
-}
diff --git a/layouts/uw-2-col/layout--uw-2-col.html.twig b/layouts/uw-2-col/layout--uw-2-col.html.twig
deleted file mode 100644
index 2ea4739882a1ed7abeb827ea0f5e0bc904f58785..0000000000000000000000000000000000000000
--- a/layouts/uw-2-col/layout--uw-2-col.html.twig
+++ /dev/null
@@ -1,19 +0,0 @@
-{%
-  set classes = [
-  'layout',
-  'layout--uw-2-col',
-  settings.column_class,
-]
-%}
-
-<section{{ attributes.addClass(classes) }}>
-
-  <div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}>
-    {{ content.first }}
-  </div>
-
-  <div {{ region_attributes.second.addClass('layout__region', 'layout__region--second') }}>
-    {{ content.second }}
-  </div>
-
-</section>
diff --git a/layouts/uw-2-col/uw-layout-2-col.css b/layouts/uw-2-col/uw-layout-2-col.css
deleted file mode 100644
index 1144668df11f49bf2ac1974e7426811619d173ce..0000000000000000000000000000000000000000
--- a/layouts/uw-2-col/uw-layout-2-col.css
+++ /dev/null
@@ -1,34 +0,0 @@
-.layout--uw-2-col {
-  display: grid;
-}
-
-.layout--uw-2-col.larger-left {
-  grid-template-columns: 67% 33%;
-}
-
-.layout--uw-2-col.larger-right {
-  grid-template-columns: 33% 67%;
-}
-
-.layout--uw-2-col.even-split {
-  grid-template-columns: 50% 50%;
-}
-
-.layout--uw-2-col .layout__region--first {
-  grid-column: 1 / 2;
-}
-
-.layout--uw-2-col .layout__region--second {
-  grid-column: 2 / 3;
-}
-
-.path-dashboard .layout__region {
-  margin-right: 1rem;
-  margin-bottom: 1rem;
-}
-
-.path-dashboard .layout__region--wrapper {
-  box-shadow: none;
-  border: 1px solid #bfbfba;
-  padding: 1rem;
-}
diff --git a/layouts/uw-3-col/layout--uw-3-col.html.twig b/layouts/uw-3-col/layout--uw-3-col.html.twig
deleted file mode 100644
index e3874ab307d2de4694917c91f060730e14847b7b..0000000000000000000000000000000000000000
--- a/layouts/uw-3-col/layout--uw-3-col.html.twig
+++ /dev/null
@@ -1,23 +0,0 @@
-{%
-  set classes = [
-  'layout',
-  'layout--uw-3-col',
-  settings.column_class,
-]
-%}
-
-<section{{ attributes.addClass(classes) }}>
-
-  <div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}>
-    {{ content.first }}
-  </div>
-
-  <div {{ region_attributes.second.addClass('layout__region', 'layout__region--second') }}>
-    {{ content.second }}
-  </div>
-
-  <div {{ region_attributes.third.addClass('layout__region', 'layout__region--third') }}>
-    {{ content.third }}
-  </div>
-
-</section>
diff --git a/layouts/uw-3-col/uw-layout-3-col.css b/layouts/uw-3-col/uw-layout-3-col.css
deleted file mode 100644
index 475524241ac79da9859a2cb89450c416618c4a91..0000000000000000000000000000000000000000
--- a/layouts/uw-3-col/uw-layout-3-col.css
+++ /dev/null
@@ -1,50 +0,0 @@
-.layout--uw-3-col {
-  display: grid;
-}
-
-.layout--uw-3-col.even-split {
-  grid-template-columns: 33% 34% 33%;
-}
-
-.layout--uw-3-col.larger-left {
-  grid-template-columns: 50% 25% 25%;
-}
-
-.layout--uw-3-col.larger-middle {
-  grid-template-columns: 25% 50% 25%;
-}
-
-.layout--uw-3-col.larger-right {
-  grid-template-columns: 25% 25% 50%;
-}
-
-.layout--uw-3-col.legacy-38-38-24 {
-  grid-template-columns: 38% 38% 24%;
-}
-
-.layout--uw-3-col.legacy-24-38-38 {
-  grid-template-columns: 24% 38% 38%;
-}
-
-.layout--uw-3-col .layout__region--first {
-  grid-column: 1 / 2;
-}
-
-.layout--uw-3-col .layout__region--second {
-  grid-column: 2 / 3;
-}
-
-.layout--uw-3-col .layout__region--third {
-  grid-column: 3 / 4;
-}
-
-.path-dashboard .layout__region {
-  margin-right: 1rem;
-  margin-bottom: 1rem;
-}
-
-.path-dashboard .layout__region--wrapper {
-  box-shadow: none;
-  border: 1px solid #bfbfba;
-  padding: 1rem;
-}
diff --git a/layouts/uw-4-col/layout--uw-4-col.html.twig b/layouts/uw-4-col/layout--uw-4-col.html.twig
deleted file mode 100644
index d98de7c115e8f969817b601e67bfdf5c6b9efda2..0000000000000000000000000000000000000000
--- a/layouts/uw-4-col/layout--uw-4-col.html.twig
+++ /dev/null
@@ -1,27 +0,0 @@
-{%
-  set classes = [
-  'layout',
-  'layout--uw-4-col',
-  settings.column_class,
-]
-%}
-
-<section{{ attributes.addClass(classes) }}>
-
-  <div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}>
-    {{ content.first }}
-  </div>
-
-  <div {{ region_attributes.second.addClass('layout__region', 'layout__region--second') }}>
-    {{ content.second }}
-  </div>
-
-  <div {{ region_attributes.third.addClass('layout__region', 'layout__region--third') }}>
-    {{ content.third }}
-  </div>
-
-  <div {{ region_attributes.fourth.addClass('layout__region', 'layout__region--fourth') }}>
-    {{ content.fourth }}
-  </div>
-
-</section>
diff --git a/layouts/uw-4-col/uw-layout-4-col.css b/layouts/uw-4-col/uw-layout-4-col.css
deleted file mode 100644
index 617dc97e3654c0aecc64f349b11e9793ca049d97..0000000000000000000000000000000000000000
--- a/layouts/uw-4-col/uw-layout-4-col.css
+++ /dev/null
@@ -1,54 +0,0 @@
-.layout--uw-4-col {
-  display: grid;
-}
-
-.layout--uw-4-col.even-split {
-  grid-template-columns: 25% 25% 25% 25%;
-}
-
-.layout--uw-4-col.larger-left {
-  grid-template-columns: 50% 16.67% 16.67% 16.66%;
-}
-
-.layout--uw-4-col.larger-second {
-  grid-template-columns: 16.67% 50% 16.67% 16.66%;
-}
-
-.layout--uw-4-col.larger-third {
-  grid-template-columns: 16.67% 16.67% 50% 16.66%;
-}
-
-.layout--uw-4-col.larger-right {
-  grid-template-columns: 16.67% 16.67% 16.66% 50%;
-}
-
-.layout--uw-4-col.legacy-23-27-27-23 {
-  grid-template-columns: 23% 27% 27% 23%;
-}
-
-.layout--uw-4-col .layout__region--first {
-  grid-column: 1 / 2;
-}
-
-.layout--uw-4-col .layout__region--second {
-  grid-column: 2 / 3;
-}
-
-.layout--uw-4-col .layout__region--third {
-  grid-column: 3 / 4;
-}
-
-.layout--uw-4-col .layout__region--fourth {
-  grid-column: 4 / 5;
-}
-
-.path-dashboard .layout__region {
-  margin-right: 1rem;
-  margin-bottom: 1rem;
-}
-
-.path-dashboard .layout__region--wrapper {
-  box-shadow: none;
-  border: 1px solid #bfbfba;
-  padding: 1rem;
-}
diff --git a/layouts/uw-5-col/layout--uw-5-col.html.twig b/layouts/uw-5-col/layout--uw-5-col.html.twig
deleted file mode 100644
index 13f0fadf68ce1615900a2c4baf1ef9d08a3f93ad..0000000000000000000000000000000000000000
--- a/layouts/uw-5-col/layout--uw-5-col.html.twig
+++ /dev/null
@@ -1,31 +0,0 @@
-{%
-  set classes = [
-  'layout',
-  'layout--uw-5-col',
-  settings.column_class,
-]
-%}
-
-<section{{ attributes.addClass(classes) }}>
-
-  <div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}>
-    {{ content.first }}
-  </div>
-
-  <div {{ region_attributes.second.addClass('layout__region', 'layout__region--second') }}>
-    {{ content.second }}
-  </div>
-
-  <div {{ region_attributes.third.addClass('layout__region', 'layout__region--third') }}>
-    {{ content.third }}
-  </div>
-
-  <div {{ region_attributes.fourth.addClass('layout__region', 'layout__region--fourth') }}>
-    {{ content.first }}
-  </div>
-
-  <div {{ region_attributes.fifth.addClass('layout__region', 'layout__region--fifth') }}>
-    {{ content.fifth }}
-  </div>
-
-</section>
diff --git a/layouts/uw-5-col/uw-layout-5-col.css b/layouts/uw-5-col/uw-layout-5-col.css
deleted file mode 100644
index 6d07129d24ad3ef212078ebd588aeaee0b3dde53..0000000000000000000000000000000000000000
--- a/layouts/uw-5-col/uw-layout-5-col.css
+++ /dev/null
@@ -1,62 +0,0 @@
-.layout--uw-5-col {
-  display: grid;
-}
-
-.layout--uw-5-col.even-split {
-  grid-template-columns: 20% 20% 20% 20% 20%;
-}
-
-.layout--uw-5-col.larger-left {
-  grid-template-columns: 40% 15% 15% 15% 15%;
-}
-
-.layout--uw-5-col.larger-second {
-  grid-template-columns: 15% 40% 15% 15% 15%;
-}
-
-.layout--uw-5-col.larger-third {
-  grid-template-columns: 15% 15% 40% 15% 15%;
-}
-
-.layout--uw-5-col.larger-fourth {
-  grid-template-columns: 15% 15% 15% 40% 15%;
-}
-
-.layout--uw-5-col.larger-right {
-  grid-template-columns: 15% 15% 15% 15% 40%;
-}
-
-.layout--uw-5-col.legacy-23-19-19-19-20 {
-  grid-template-columns: 23% 19% 19% 19% 20%;
-}
-
-.layout--uw-5-col .layout__region--first {
-  grid-column: 1 / 2;
-}
-
-.layout--uw-5-col .layout__region--second {
-  grid-column: 2 / 3;
-}
-
-.layout--uw-5-col .layout__region--third {
-  grid-column: 3 / 4;
-}
-
-.layout--uw-5-col .layout__region--fourth {
-  grid-column: 4 / 5;
-}
-
-.layout--uw-5-col.layout__region--fifth {
-  grid-column: 5 / 6;
-}
-
-.path-dashboard .layout__region {
-  margin-right: 1rem;
-  margin-bottom: 1rem;
-}
-
-.path-dashboard .layout__region--wrapper {
-  box-shadow: none;
-  border: 1px solid #bfbfba;
-  padding: 1rem;
-}
diff --git a/layouts/uw-inverted-l-left/layout--uw-inverted-l-left.html.twig b/layouts/uw-inverted-l-left/layout--uw-inverted-l-left.html.twig
deleted file mode 100644
index b6cc5fca74c82e16d0a228eb5718dbdb0cd5be31..0000000000000000000000000000000000000000
--- a/layouts/uw-inverted-l-left/layout--uw-inverted-l-left.html.twig
+++ /dev/null
@@ -1,27 +0,0 @@
-{%
-  set classes = [
-  'layout',
-  'layout--uw-inverted-l-left',
-  settings.column_class,
-]
-%}
-
-<section{{ attributes.addClass(classes) }}>
-
-  <div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}>
-    {{ content.first }}
-  </div>
-
-  <div {{ region_attributes.second.addClass('layout__region', 'layout__region--second') }}>
-    {{ content.second }}
-  </div>
-
-  <div {{ region_attributes.third.addClass('layout__region', 'layout__region--third') }}>
-    {{ content.third }}
-  </div>
-
-  <div {{ region_attributes.fourth.addClass('layout__region', 'layout__region--fourth') }}>
-    {{ content.fourth }}
-  </div>
-
-</section>
diff --git a/layouts/uw-inverted-l-left/uw-layout-inverted-l-left.css b/layouts/uw-inverted-l-left/uw-layout-inverted-l-left.css
deleted file mode 100644
index 79a278b022c7ff09caf6036bc7c9571e084a83df..0000000000000000000000000000000000000000
--- a/layouts/uw-inverted-l-left/uw-layout-inverted-l-left.css
+++ /dev/null
@@ -1,46 +0,0 @@
-.layout--uw-inverted-l-left {
-  display: grid;
-}
-
-.layout--uw-inverted-l-left.even-split {
-  grid-template-columns: 50% 25% 25%;
-}
-
-.layout--uw-inverted-l-left.larger-left {
-  grid-template-columns: 50% 33.5% 16.5%;
-}
-
-.layout--uw-inverted-l-left.larger-right {
-  grid-template-columns: 50% 16.5% 33.5%;
-}
-
-.layout--uw-inverted-l-left .layout__region--first {
-  grid-column: 1 / 2;
-  grid-row: 1 / 3;
-}
-
-.layout--uw-inverted-l-left .layout__region--second {
-  grid-column: 2 / 3;
-  grid-row: 1 / 2;
-}
-
-.layout--uw-inverted-l-left .layout__region--third {
-  grid-column: 3 / 4;
-  grid-row: 1 / 2;
-}
-
-.layout--uw-inverted-l-left .layout__region--fourth {
-  grid-column: 2 / 4;
-  grid-row: 2 / 3;
-}
-
-.path-dashboard .layout__region {
-  margin-right: 1rem;
-  margin-bottom: 1rem;
-}
-
-.path-dashboard .layout__region--wrapper {
-  box-shadow: none;
-  border: 1px solid #bfbfba;
-  padding: 1rem;
-}
diff --git a/layouts/uw-inverted-l-right/layout--uw-inverted-l-right.html.twig b/layouts/uw-inverted-l-right/layout--uw-inverted-l-right.html.twig
deleted file mode 100644
index ef5e9c7ad874e18698e8f92355457f7cf29287c8..0000000000000000000000000000000000000000
--- a/layouts/uw-inverted-l-right/layout--uw-inverted-l-right.html.twig
+++ /dev/null
@@ -1,27 +0,0 @@
-{%
-  set classes = [
-  'layout',
-  'layout--uw-inverted-l-right',
-  settings.column_class,
-]
-%}
-
-<section{{ attributes.addClass(classes) }}>
-
-  <div {{ region_attributes.first.addClass('layout__region', 'layout__region--first') }}>
-    {{ content.first }}
-  </div>
-
-  <div {{ region_attributes.second.addClass('layout__region', 'layout__region--second') }}>
-    {{ content.second }}
-  </div>
-
-  <div {{ region_attributes.third.addClass('layout__region', 'layout__region--third') }}>
-    {{ content.third }}
-  </div>
-
-  <div {{ region_attributes.fourth.addClass('layout__region', 'layout__region--fourth') }}>
-    {{ content.fourth }}
-  </div>
-
-</section>
diff --git a/layouts/uw-inverted-l-right/uw-layout-inverted-l-right.css b/layouts/uw-inverted-l-right/uw-layout-inverted-l-right.css
deleted file mode 100644
index 97b0651fa597d5ad1d8bb7c7913aa047ab83a488..0000000000000000000000000000000000000000
--- a/layouts/uw-inverted-l-right/uw-layout-inverted-l-right.css
+++ /dev/null
@@ -1,46 +0,0 @@
-.layout--uw-inverted-l-right {
-  display: grid;
-}
-
-.layout--uw-inverted-l-right.even-split {
-  grid-template-columns: 25% 25% 50%;
-}
-
-.layout--uw-inverted-l-right.larger-left {
-  grid-template-columns: 33.5% 16.5% 50%;
-}
-
-.layout--uw-inverted-l-right.larger-right {
-  grid-template-columns: 16.5% 33.5% 50%;
-}
-
-.layout--uw-inverted-l-right .layout__region--first {
-  grid-column: 1 / 2;
-  grid-row: 1 / 2;
-}
-
-.layout--uw-inverted-l-right .layout__region--first {
-  grid-column: 2 / 3;
-  grid-row: 1 / 2;
-}
-
-.layout--uw-inverted-l-right .layout__region--third {
-  grid-column: 1 / 3;
-  grid-row: 2 / 3;
-}
-
-.layout--uw-inverted-l-right .layout__region--fourth {
-  grid-column: 3 / 4;
-  grid-row: 1 / 3;
-}
-
-.path-dashboard .layout__region {
-  margin-right: 1rem;
-  margin-bottom: 1rem;
-}
-
-.path-dashboard .layout__region--wrapper {
-  box-shadow: none;
-  border: 1px solid #bfbfba;
-  padding: 1rem;
-}
diff --git a/uw_cfg_common.layouts.yml b/uw_cfg_common.layouts.yml
index cb2413e0a6e88fc98a6dc51181892f7dbc2558d5..1969ed360432475d3009159e9d7117a1329b83f7 100644
--- a/uw_cfg_common.layouts.yml
+++ b/uw_cfg_common.layouts.yml
@@ -1,8 +1,7 @@
 uw_1_column:
   label: 'One column'
   category: 'UW layouts'
-  library: uw_cfg_common/uw_layout_1_col
-  template: layouts/uw-1-col/layout--uw-1-col
+  template: layouts/layout--uw-1-col
   default_region: first
   regions:
     first:
@@ -13,8 +12,7 @@ uw_2_column:
   label: 'Two columns'
   category: 'UW layouts'
   class: '\Drupal\uw_cfg_common\Plugin\Layout\UwColumnLayoutBase'
-  library: uw_cfg_common/uw_layout_2_col
-  template: layouts/uw-2-col/layout--uw-2-col
+  template: layouts/layout--uw-2-col
   default_region: first
   regions:
     first:
@@ -33,8 +31,7 @@ uw_3_column:
   label: 'Three columns'
   category: 'UW layouts'
   class: '\Drupal\uw_cfg_common\Plugin\Layout\UwColumnLayoutBase'
-  library: uw_cfg_common/uw_layout_3_col
-  template: layouts/uw-3-col/layout--uw-3-col
+  template: layouts/layout--uw-3-col
   default_region: first
   regions:
     first:
@@ -58,8 +55,7 @@ uw_4_column:
   label: 'Four columns'
   category: 'UW layouts'
   class: '\Drupal\uw_cfg_common\Plugin\Layout\UwColumnLayoutBase'
-  library: uw_cfg_common/uw_layout_4_col
-  template: layouts/uw-4-col/layout--uw-4-col
+  template: layouts/layout--uw-4-col
   default_region: first
   regions:
     first:
@@ -74,19 +70,18 @@ uw_4_column:
     - [first, second, third, fourth]
   column_options:
     columns:
-      even-split': 'Even split (25%, 25%, 25%, 25%)'
-      larger-left': 'Larger left (50%, 16.67%, 16.67%, 16.67%)'
-      larger-second': 'Larger second (16.67%, 50%, 16.67%, 16.67%)'
-      larger-third': 'Larger third (16.67%, 16.67%, 50%, 16.67%)'
-      larger-right': 'Larger right (16.67%, 16.67%, 16.67%, 50%)'
-      legacy-23-27-27-23': 'Legacy (23%, 27%, 27%, 23%)'
+      even-split: 'Even split (25%, 25%, 25%, 25%)'
+      larger-left: 'Larger left (50%, 16.67%, 16.67%, 16.67%)'
+      larger-second: 'Larger second (16.67%, 50%, 16.67%, 16.67%)'
+      larger-third: 'Larger third (16.67%, 16.67%, 50%, 16.67%)'
+      larger-right: 'Larger right (16.67%, 16.67%, 16.67%, 50%)'
+      legacy-23-27-27-23: 'Legacy (23%, 27%, 27%, 23%)'
     default: 'even-split'
 uw_5_column:
   label: 'Five columns'
   category: 'UW layouts'
   class: '\Drupal\uw_cfg_common\Plugin\Layout\UwColumnLayoutBase'
-  library: uw_cfg_common/uw_layout_5_col
-  template: layouts/uw-5-col/layout--uw-5-col
+  template: layouts/layout--uw-5-col
   default_region: first
   regions:
     first:
@@ -103,20 +98,19 @@ uw_5_column:
     - [first, second, third, fourth, fifth]
   column_options:
     columns:
-      even-split': 'Even split (20%, 20%, 20%, 20%, 20%)'
-      larger-left': 'Larger left (40%, 15%, 15%, 15%, 15%)'
-      larger-second': 'Larger second (15%, 40%, 15%, 15%, 15%)'
-      larger-third': 'Larger third (15%, 15%, 40%, 15%, 15%)'
-      larger-fourth': 'Larger fourth (15%, 15%, 15%, 40%, 15%)'
-      larger-right': 'Larger right (15%, 15%, 15%, 15%, 40%)'
-      legacy-23-19-19-19-20': 'Legacy (23%, 19%, 19%, 19%, 20%)'
+      even-split: 'Even split (20%, 20%, 20%, 20%, 20%)'
+      larger-left: 'Larger left (40%, 15%, 15%, 15%, 15%)'
+      larger-second: 'Larger second (15%, 40%, 15%, 15%, 15%)'
+      larger-third: 'Larger third (15%, 15%, 40%, 15%, 15%)'
+      larger-fourth: 'Larger fourth (15%, 15%, 15%, 40%, 15%)'
+      larger-right: 'Larger right (15%, 15%, 15%, 15%, 40%)'
+      legacy-23-19-19-19-20: 'Legacy (23%, 19%, 19%, 19%, 20%)'
     default: 'even-split'
 uw_inverted_l_right:
   label: 'Inverted "L" - right'
   category: 'UW layouts'
   class: '\Drupal\uw_cfg_common\Plugin\Layout\UwColumnLayoutBase'
-  library: uw_cfg_common/uw_layout_inverted_l_right
-  template: layouts/uw-inverted-l-right/layout--uw-inverted-l-right
+  template: layouts/layout--uw-inverted-l-right
   default_region: first
   regions:
     first:
@@ -140,8 +134,7 @@ uw_inverted_l_left:
   label: 'Inverted "L" - left'
   category: 'UW layouts'
   class: '\Drupal\uw_cfg_common\Plugin\Layout\UwColumnLayoutBase'
-  library: uw_cfg_common/uw_layout_inverted_l_left
-  template: layouts/uw-inverted-l-left/layout--uw-inverted-l-left
+  template: layouts/layout--uw-inverted-l-left
   default_region: first
   regions:
     first:
diff --git a/uw_cfg_common.libraries.yml b/uw_cfg_common.libraries.yml
index 4aabb6dc58d81af8151c19ac7dc890fdbbd09ba8..7fd5c46f098c2bbbcc3eb7cf0839b9a59bc1b2a3 100644
--- a/uw_cfg_common.libraries.yml
+++ b/uw_cfg_common.libraries.yml
@@ -1,38 +1,3 @@
-uw_layout_1_col:
-  version: 1.0
-  css:
-    theme:
-      layouts/uw-1-col/uw-layout-1-col.css: {}
-uw_layout_2_col:
-  version: 1.0
-  css:
-    theme:
-      layouts/uw-2-col/uw-layout-2-col.css: {}
-uw_layout_3_col:
-  version: 1.0
-  css:
-    theme:
-      layouts/uw-3-col/uw-layout-3-col.css: {}
-uw_layout_4_col:
-  version: 1.0
-  css:
-    theme:
-      layouts/uw-4-col/uw-layout-4-col.css: {}
-uw_layout_5_col:
-  version: 1.0
-  css:
-    theme:
-      layouts/uw-5-col/uw-layout-5-col.css: {}
-uw_layout_inverted_l_right:
-  version: 1.0
-  css:
-    theme:
-      layouts/uw-inverted-l-right/uw-layout-inverted-l-right.css: {}
-uw_layout_inverted_l_left:
-  version: 1.0
-  css:
-    theme:
-      layouts/uw-inverted-l-left/uw-layout-inverted-l-left.css: {}
-uw_mathjax:
-  js:
-    https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.7/MathJax.js?config=TeX-AMS_HTML: { type: external, minified: true }
+uw_mathjax:
+  js:
+    https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.7/MathJax.js?config=TeX-AMS_HTML: { type: external, minified: true }