diff --git a/menu-attributes-3052146-4.patch b/menu-attributes-3052146-4.patch
deleted file mode 100644
index aac3e40202940507e166932dc15609d000e36443..0000000000000000000000000000000000000000
--- a/menu-attributes-3052146-4.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/templates/navigation/menu--account.html.twig b/templates/navigation/menu--account.html.twig
-index 72f55cc..3633708 100644
---- a/templates/navigation/menu--account.html.twig
-+++ b/templates/navigation/menu--account.html.twig
-@@ -36,7 +36,6 @@
-           set classes = [
-            'nav-link',
-             item.in_active_trail ? 'active',
--            item.url.getOption('attributes').class ? item.url.getOption('attributes').class | join(' '),
-           ]
-         %}
-         {{ link(item.title, item.url, {'class': classes}) }}
-diff --git a/templates/navigation/menu--footer.html.twig b/templates/navigation/menu--footer.html.twig
-index 637ee6e..13d42f5 100644
---- a/templates/navigation/menu--footer.html.twig
-+++ b/templates/navigation/menu--footer.html.twig
-@@ -48,7 +48,6 @@
-           set link_classes = [
-             'nav-link',
-             item.in_active_trail ? 'active',
--            item.url.getOption('attributes').class ? item.url.getOption('attributes').class | join(' '),
-           ]
-         %}
-         {{ link(item.title, item.url, {'class': link_classes}) }}
-diff --git a/templates/navigation/menu--main.html.twig b/templates/navigation/menu--main.html.twig
-index 58f4f48..117f9d0 100644
---- a/templates/navigation/menu--main.html.twig
-+++ b/templates/navigation/menu--main.html.twig
-@@ -50,7 +50,6 @@
-             not menu_level ? 'nav-link',
-             item.in_active_trail ? 'active',
-             item.below ? 'dropdown-toggle',
--            item.url.getOption('attributes').class ? item.url.getOption('attributes').class | join(' '),
-           ]
-         %}
-         {% if item.below %}
-diff --git a/templates/navigation/menu-local-task.html.twig b/templates/navigation/menu-local-task.html.twig
-index b341d2c..74d4918 100644
---- a/templates/navigation/menu-local-task.html.twig
-+++ b/templates/navigation/menu-local-task.html.twig
-@@ -20,7 +20,6 @@
-   set classes = [
-     'nav-link',
-     is_active ? 'active',
--    item.url.getOption('attributes').class ? item.url.getOption('attributes').class | join(' '),
-   ]
- %}
- <li{{ attributes.addClass(is_active ? 'active', 'nav-item') }}>{{ link(item.text, item.url, {'class': classes}) }}</li>
-diff --git a/templates/navigation/menu.html.twig b/templates/navigation/menu.html.twig
-index f9eda06..88b0a19 100644
---- a/templates/navigation/menu.html.twig
-+++ b/templates/navigation/menu.html.twig
-@@ -48,7 +48,6 @@
-           set link_classes = [
-             'nav-link',
-             item.in_active_trail ? 'active',
--            item.url.getOption('attributes').class ? item.url.getOption('attributes').class,
-           ]
-         %}
-         {{ link(item.title, item.url, {'class': link_classes}) }}
diff --git a/templates/navigation/links--language-block.html.twig b/templates/navigation/links--language-block.html.twig
new file mode 100644
index 0000000000000000000000000000000000000000..aa49118f9ed6e2962a79c8641559f417f1b2745f
--- /dev/null
+++ b/templates/navigation/links--language-block.html.twig
@@ -0,0 +1,53 @@
+{#
+/**
+ * @file
+ * Theme override to display inline links.
+ *
+ * Available variables:
+ * - attributes: Attributes for the UL containing the list of links.
+ * - links: Links to be output.
+ *   Each link will have the following elements:
+ *   - title: The link text.
+ *   - href: The link URL. If omitted, the 'title' is shown as a plain text
+ *     item in the links list. If 'href' is supplied, the entire link is passed
+ *     to l() as its $options parameter.
+ *   - attributes: (optional) HTML attributes for the anchor, or for the <span>
+ *     tag if no 'href' is supplied.
+ *   - link_key: The link CSS class.
+ * - heading: (optional) A heading to precede the links.
+ *   - text: The heading text.
+ *   - level: The heading level (e.g. 'h2', 'h3').
+ *   - attributes: (optional) A keyed list of attributes for the heading.
+ *   If the heading is a string, it will be used as the text of the heading and
+ *   the level will default to 'h2'.
+ *
+ *   Headings should be used on navigation menus and any list of links that
+ *   consistently appears on multiple pages. To make the heading invisible use
+ *   the 'visually-hidden' CSS class. Do not use 'display:none', which
+ *   removes it from screen readers and assistive technology. Headings allow
+ *   screen reader and keyboard only users to navigate to or skip the links.
+ *   See http://juicystudio.com/article/screen-readers-display-none.php and
+ *   http://www.w3.org/TR/WCAG-TECHS/H42.html for more information.
+ *
+ * @see template_preprocess_links()
+ *
+ * @ingroup themeable
+ */
+#}
+{{ attach_library('bootstrap_barrio/links') }}
+
+{% if links %}
+  <nav{{ attributes.addClass(['nav', 'links-inline']) }}>
+    {%- for key, item in links -%}
+      <span{{ item.attributes.addClass(key|clean_class, 'nav-link') }}>
+        {%- if item.link -%}
+          {{ item.link }}
+        {%- elseif item.text_attributes -%}
+          <span{{ item.text_attributes }}>{{ item.text }}</span>
+        {%- else -%}
+          {{ item.text }}
+        {%- endif -%}
+      </span>
+    {%- endfor -%}
+  </nav>
+{% endif %}
\ No newline at end of file