diff --git a/majak_uistyleguide/templates/patterns/atoms/tags/tag.html b/majak_uistyleguide/templates/patterns/atoms/tags/tag.html
index 1ff24fbc14f9b206cc171f5bdcf28dcd9736b56a..342409fe4d32077452e56257cf0bdf06be6e527c 100644
--- a/majak_uistyleguide/templates/patterns/atoms/tags/tag.html
+++ b/majak_uistyleguide/templates/patterns/atoms/tags/tag.html
@@ -4,7 +4,7 @@
     {% if color_classes %}
       {{ color_classes }}
     {% else %}
-      text-black bg-yellow-500 hover:bg-yellow-600
+      text-black bg-white hover:bg-pirati-yellow
     {% endif %}
 
     px-4 py-2 duration-200 hover:no-underline
diff --git a/majak_uistyleguide/templates/patterns/molecules/blocks/icon_title_text_block.html b/majak_uistyleguide/templates/patterns/molecules/blocks/icon_title_text_block.html
index 3d754afc488e2588cc32f04e1cac1447e3adfa54..ebb46c95219477c1a8ecfe18ed88a8bbb82ab504 100644
--- a/majak_uistyleguide/templates/patterns/molecules/blocks/icon_title_text_block.html
+++ b/majak_uistyleguide/templates/patterns/molecules/blocks/icon_title_text_block.html
@@ -4,7 +4,7 @@
 {% else %}
   <div
 {% endif %}
-    class="hover:no-underline mb-12 flex gap-3 max-w-4xl"
+    class="hover:no-underline mb-12 flex gap-3"
   >
 
   {% if icon %}
@@ -15,7 +15,7 @@
     <h3 class="font-alt mb-4 text-4xl">
       {{ title }}
     </h3>
-    <div class="prose [&>div.content-block>p:first-child]:mt-0">
+    <div class="prose max-w-none [&>div.content-block>p:first-child]:mt-0">
       <div class="content-block">
         <p>
           {{ text }}
diff --git a/majak_uistyleguide/templates/patterns/organisms/layout/navbar.yaml b/majak_uistyleguide/templates/patterns/organisms/layout/navbar.yaml
index fd401e3a4a2d456283a9876709802bd045592a18..317b43c058e6091315ed52097800f36b2a846460 100644
--- a/majak_uistyleguide/templates/patterns/organisms/layout/navbar.yaml
+++ b/majak_uistyleguide/templates/patterns/organisms/layout/navbar.yaml
@@ -20,7 +20,7 @@ context:
       name: 'Aktuality'
       url: '#'
     -
-      name: 'Progran'
+      name: 'Program'
       url: '#'
     -
       name: 'Kdo jsme'
diff --git a/majak_uistyleguide/templates/patterns/templates/main/program/program.html b/majak_uistyleguide/templates/patterns/templates/main/program/program.html
index f1915b0ec0f7d34c6c2f2ae4313e1dc35de35be8..accafc27213ea82f6136acbd9712df3b98acde22 100644
--- a/majak_uistyleguide/templates/patterns/templates/main/program/program.html
+++ b/majak_uistyleguide/templates/patterns/templates/main/program/program.html
@@ -15,7 +15,7 @@
             <div class="container--wide flex flex-col mt-20 mb-4 xl:mb-20">
               {% if program.perex %}
                 <div class="mb-12">
-                  <div class="prose">
+                  <div class="prose max-w-none">
                     {# BEGIN Cast generovana Majakem #}<div class="content-block">
                       <p>
                           {{ program.perex }}
diff --git a/src/css/molecules/popout.pcss b/src/css/molecules/popout.pcss
index 8639c4a779ef174e5e10387416b0946ea376fbe1..b6f7c55b5ac7582692c6135b463c81e3726aac5c 100644
--- a/src/css/molecules/popout.pcss
+++ b/src/css/molecules/popout.pcss
@@ -2,7 +2,7 @@
   @apply px-5 text-lg flex justify-between items-center cursor-pointer duration-150 hover:bg-grey-150;
 
   &.popout__toggle-wrapper--active {
-    @apply bg-yellow-500;
+    @apply bg-pirati-yellow;
   }
 }
 
diff --git a/src/css/molecules/switch.pcss b/src/css/molecules/switch.pcss
index 667b5744da69003272744825754dab9df271a052..d4976326a33127ac8f774407aacfcbe126472e43 100644
--- a/src/css/molecules/switch.pcss
+++ b/src/css/molecules/switch.pcss
@@ -11,15 +11,15 @@
 }
 
 .switch__item {
-  @apply bg-yellow-500 text-black;
+  @apply bg-white text-black;
 
   &:hover {
-    @apply no-underline bg-yellow-600;
+    @apply no-underline bg-pirati-yellow;
   }
 
   &.switch__item--active,
   &.switch__item--active:hover {
-    @apply bg-grey-150;
+    @apply bg-pirati-yellow;
   }
 }
 
diff --git a/tailwind.config.js b/tailwind.config.js
index 320f5a975f915ce49a8bb33065e8c6378a32dd7f..97c2eaa5e54322eddc89135d63dea26cf8048da4 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -189,7 +189,7 @@ module.exports = {
                 '700': '#7d347d',
             },
             'pirati': {
-                'yellow': '#fec900'
+                'yellow': '#f2c700'
             }
         },
         container: {