diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index 4ad2e80..53a5e09 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+- TMS-1045: Style changes:
+    - Remove "Tampere Filharmonia" pseudo text-elements from hero
+    - Change hero CTA-button colors
+    - Change footer "Tampere"-logo color
+    - Change page background-color from grey to white
+    - Add borders to elements with a white background
+
+## [1.12.2] - 2024-05-20
+
 - TMS-1028: Fix footer social-media icon color
 
 ## [1.12.1] – 2023-05-24
diff --git a/assets/styles/blocks/_image-gallery.scss b/assets/styles/blocks/_image-gallery.scss
index 94433dc..86e10c2 100644
--- a/assets/styles/blocks/_image-gallery.scss
+++ b/assets/styles/blocks/_image-gallery.scss
@@ -13,5 +13,9 @@
         .icon {
             fill: currentColor !important;
         }
+
+        &.is-primary .icon {
+            fill: $primary !important;
+        }
     }
 }
diff --git a/assets/styles/layouts/_articles.scss b/assets/styles/layouts/_articles.scss
index d3c3bcd..a86d34a 100644
--- a/assets/styles/layouts/_articles.scss
+++ b/assets/styles/layouts/_articles.scss
@@ -40,3 +40,13 @@
         font-weight: 700 !important;
     }
 }
+
+.Home,
+.layout-articles,
+.layout-blog-articles {
+    .highlight-article {
+        .has-background-secondary {
+            border: 1px solid $secondary-invert !important;
+        }
+    }
+}
diff --git a/assets/styles/layouts/_hero.scss b/assets/styles/layouts/_hero.scss
index 39d2a83..61c2200 100644
--- a/assets/styles/layouts/_hero.scss
+++ b/assets/styles/layouts/_hero.scss
@@ -38,35 +38,6 @@
 
         @include from($desktop) {
             min-height: 36.198vw !important; // sass-lint:disable-line no-important
-
-            &::before,
-            &::after {
-                content: '';
-                position: absolute;
-                top: 0;
-                bottom: 0;
-                z-index: 1;
-                width: 40px;
-                height: 100%;
-                background-repeat: no-repeat;
-                background-position-y: center;
-                background-size: contain;
-            }
-
-            &::before {
-                top: 7.5%;
-                bottom: 7.5%;
-                left: 0;
-                height: 85%;
-                background-image: url('images/tampere-pysty.svg');
-                background-position-x: 0;
-            }
-
-            &::after {
-                right: 0;
-                background-image: url('images/tampere-filharmonia-pysty.svg');
-                background-position-x: 100%;
-            }
         }
 
         @include from(1600px) {
diff --git a/assets/styles/layouts/_textblock.scss b/assets/styles/layouts/_textblock.scss
new file mode 100644
index 0000000..452eafa
--- /dev/null
+++ b/assets/styles/layouts/_textblock.scss
@@ -0,0 +1,7 @@
+.layout-textblock {
+    &.has-background-primary {
+        h2 {
+            color: $primary-invert !important;
+        }
+    }
+}
\ No newline at end of file
diff --git a/assets/styles/layouts/index.scss b/assets/styles/layouts/index.scss
index e93a3c0..8b675a6 100644
--- a/assets/styles/layouts/index.scss
+++ b/assets/styles/layouts/index.scss
@@ -12,3 +12,4 @@
 @import "events";
 @import "logo-wall";
 @import "content-columns";
+@import "textblock";
diff --git a/assets/styles/overrides/_button.scss b/assets/styles/overrides/_button.scss
index e031d82..890d19d 100644
--- a/assets/styles/overrides/_button.scss
+++ b/assets/styles/overrides/_button.scss
@@ -1,7 +1,7 @@
 .button {
     &.is-primary {
         color: $primary-invert !important;
-        
+
         .icon {
             fill: $primary-invert !important;
         }
@@ -16,7 +16,7 @@
 
         &:hover,
         &:focus {
-            border-color: $primary-invert !important;
+            border-color: $primary !important;
         }
     }
 
@@ -27,7 +27,8 @@
             &:hover {
                 color: $primary !important;
                 background-color: $primary-invert !important;
-                border-color: $primary-invert !important;
+                border-color: $primary !important;
+                text-decoration: underline !important;
 
                 .icon {
                     fill: $primary !important;
@@ -39,8 +40,8 @@
             &.is-focused,
             &:focus {
                 color: $secondary-invert !important;
-                background-color: $primary-invert !important;
-                border-color: $primary-invert !important;
+                background-color: $tertiary !important;
+                border-color: $tertiary !important;
 
                 .icon {
                     fill: $secondary-invert !important;
@@ -73,8 +74,9 @@
             &.is-hovered,
             &:hover {
                 color: $secondary-invert !important;
-                background-color: $primary-invert !important;
-                border-color: $primary-invert !important;
+                background-color: $tertiary !important;
+                border-color: $secondary-invert !important;
+                text-decoration: underline !important;
 
                 .icon {
                     fill: $secondary-invert !important;
diff --git a/assets/styles/overrides/_colors.scss b/assets/styles/overrides/_colors.scss
index baf2a17..d915371 100644
--- a/assets/styles/overrides/_colors.scss
+++ b/assets/styles/overrides/_colors.scss
@@ -33,3 +33,9 @@
         color: $secondary-invert;
     }
 }
+
+.has-colors-white,
+.has-background-secondary,
+.has-colors-secondary {
+    border: 1px solid $secondary-invert;
+}
diff --git a/assets/styles/overrides/_events.scss b/assets/styles/overrides/_events.scss
index 4ca0b12..1f6e19c 100644
--- a/assets/styles/overrides/_events.scss
+++ b/assets/styles/overrides/_events.scss
@@ -4,6 +4,8 @@
 
 .events {
     &__item {
+        border: 1px solid $secondary-invert;
+
         .pill {
             display: none;
         }
diff --git a/assets/styles/overrides/_forms.scss b/assets/styles/overrides/_forms.scss
new file mode 100644
index 0000000..a6a3779
--- /dev/null
+++ b/assets/styles/overrides/_forms.scss
@@ -0,0 +1,12 @@
+/**
+ * Gravityforms
+ */
+.gform_wrapper {
+    form {
+        select,
+        input,
+        textarea {
+            border: 1px solid $secondary-invert;
+        }
+    }
+}
diff --git a/assets/styles/overrides/_grid.scss b/assets/styles/overrides/_grid.scss
index 8a5eb75..d4cc899 100644
--- a/assets/styles/overrides/_grid.scss
+++ b/assets/styles/overrides/_grid.scss
@@ -5,7 +5,7 @@
 .grid {
     &__item {
         color: $secondary-invert !important;
-        background-color: $secondary !important;
+        border: 1px solid $secondary-invert;
 
         .button {
             color: $white !important;
@@ -22,6 +22,12 @@
             }
         }
 
+        &.has-colors-accent {
+            .button {
+                border-color: $white !important;
+            }
+        }
+
         &--featured {
             a {
                 &.button {
diff --git a/assets/styles/overrides/_header-top.scss b/assets/styles/overrides/_header-top.scss
index 3673f01..594edd0 100644
--- a/assets/styles/overrides/_header-top.scss
+++ b/assets/styles/overrides/_header-top.scss
@@ -1,5 +1,4 @@
 .site-header {
-
     &__logo-image {
         @include from($tablet) {
             min-width: 10rem;
@@ -29,7 +28,7 @@
             padding-left: 1rem;
             border-color: $black !important;
             color: $black !important;
-    
+
             .icon {
                 fill: $black !important;
             }
@@ -43,11 +42,11 @@
             padding-top: 0;
             border-bottom-right-radius: 0.25rem;
             border-bottom-left-radius: 0.25rem;
-            
+
             .dropdown-content {
                 background-color: $secondary;
             }
-           
+
         }
 
     }
diff --git a/assets/styles/overrides/_share-links.scss b/assets/styles/overrides/_share-links.scss
index fa43174..c54f99a 100644
--- a/assets/styles/overrides/_share-links.scss
+++ b/assets/styles/overrides/_share-links.scss
@@ -1,6 +1,7 @@
 .share-links {
     a {
         transition: box-shadow $easing $speed;
+        border: 1px solid $secondary-invert;
 
         &.is-hovered,
         &:hover {
diff --git a/assets/styles/overrides/index.scss b/assets/styles/overrides/index.scss
index 6e6e2a8..858dc8a 100644
--- a/assets/styles/overrides/index.scss
+++ b/assets/styles/overrides/index.scss
@@ -7,6 +7,7 @@
 @import "colors";
 @import "events";
 @import "fly-out-nav";
+@import "forms";
 @import "footer";
 @import "grid";
 @import "header-top";
diff --git a/assets/styles/theme-filharmonia.scss b/assets/styles/theme-filharmonia.scss
index da76ad1..1be17c1 100644
--- a/assets/styles/theme-filharmonia.scss
+++ b/assets/styles/theme-filharmonia.scss
@@ -11,14 +11,14 @@ $primary-light-invert: $color-white;
 $primary-dark: bulmaDarken($primary, 15);
 $primary-dark-invert: $color-white;
 
-$secondary: #dee3e3;
+$secondary: $color-white;
 $secondary-invert: $color-black;
 $secondary-light: bulmaLighten($secondary, 10);
 $secondary-light-invert: $color-black;
 $secondary-dark: bulmaDarken($secondary, 10);
 $secondary-dark-invert: $color-black;
 
-$tertiary: $color-white;
+$tertiary: #dee3e3;
 $tertiary-invert: $color-black;
 
 $light: $primary-light;
diff --git a/lib/ThemeCustomizationController.php b/lib/ThemeCustomizationController.php
index 4ca93f7..78d0286 100644
--- a/lib/ThemeCustomizationController.php
+++ b/lib/ThemeCustomizationController.php
@@ -21,100 +21,100 @@ class ThemeCustomizationController implements Controller {
      * @return void
      */
     public function hooks() : void {
-        add_filter(
+        \add_filter(
             'tms/theme/header/colors',
             \Closure::fromCallable( [ $this, 'header_colors' ] ),
             10,
             1
         );
 
-        add_filter(
+        \add_filter(
             'tms/theme/footer/colors',
             \Closure::fromCallable( [ $this, 'footer_colors' ] ),
             10,
             1
         );
 
-        add_filter(
+        \add_filter(
             'tms/theme/footer/typgraphy',
             \Closure::fromCallable( [ $this, 'footer_typography' ] ),
             10,
             1
         );
 
-        add_filter(
+        \add_filter(
             'tms/theme/share_links/link_class',
             fn() => 'has-background-primary-invert'
         );
 
-        add_filter(
+        \add_filter(
             'tms/theme/share_links/icon_class',
             fn() => 'is-black'
         );
 
-        add_filter(
+        \add_filter(
             'tms/theme/accent_colors',
             [ $this, 'get_theme_accent_colors' ]
         );
 
-        add_filter(
+        \add_filter(
             'tms/theme/search/search_item',
             [ $this, 'search_classes' ]
         );
 
-        add_filter(
+        \add_filter(
             'tms/theme/base/search_result_item',
             [ $this, 'alter_search_result_item' ]
         );
 
-        add_filter(
+        \add_filter(
             'tms/theme/event/hero_info_classes',
-            fn() => 'has-colors-tertiary'
+            fn() => 'has-colors-secondary'
         );
 
-        add_filter( 'tms/theme/event/group_title', function () {
+        \add_filter( 'tms/theme/event/group_title', function () {
             return [
-                'title' => 'has-background-tertiary',
+                'title' => 'has-background-secondary',
                 'icon'  => 'is-accent',
             ];
         } );
 
-        add_filter( 'tms/acf/block/material/data', function ( $data ) {
+        \add_filter( 'tms/acf/block/material/data', function ( $data ) {
             $data['button_classes'] = 'is-primary';
 
             return $data;
         } );
 
-        add_filter(
+        \add_filter(
             'tms/plugin-materials/page_materials/material_page_item_button_classes',
             fn() => 'is-primary'
         );
 
-        add_filter(
+        \add_filter(
             'tms/plugin-materials/page_materials/material_page_item_classes',
             fn() => ''
         );
 
-        add_filter( 'tms/theme/event/info_group_classes', fn() => '' );
+        \add_filter( 'tms/theme/event/info_group_classes', fn() => '' );
 
-        add_filter(
+        \add_filter(
             'tms/acf/block/quote/data',
             [ $this, 'alter_quote_block_data' ]
         );
 
-        add_filter(
+        \add_filter(
             'tms/acf/block/subpages/data',
             [ $this, 'alter_block_subpages_data' ],
             30
         );
 
-        add_filter(
+        \add_filter(
             'tms/theme/layout_events/all_events_link',
             fn() => 'is-size-7 has-text-decoration-underline'
         );
 
-        add_filter( 'tms/acf/layout/image_carousel/data', [ $this, 'alter_image_carousel_data' ], 20 );
-        add_filter( 'tms/acf/block/image_carousel/data', [ $this, 'alter_image_carousel_data' ], 20 );
+        \add_filter( 'tms/acf/layout/image_carousel/data', [ $this, 'alter_image_carousel_data' ], 20 );
+        \add_filter( 'tms/acf/block/image_carousel/data', [ $this, 'alter_image_carousel_data' ], 20 );
     }
 
     /**
@@ -150,7 +150,6 @@ public function footer_colors( $colors ) : array {
         $colors['container']   = 'has-background-secondary has-text-secondary-invert';
         $colors['back_to_top'] = 'is-secondary-invert is-outlined';
         $colors['link']        = 'has-text-secondary-invert';
-        $colors['link_icon']   = 'is-black';
 
         return $colors;
     }
diff --git a/partials/layouts/layout-hero.dust b/partials/layouts/layout-hero.dust
index 3a07b73..698e0c9 100644
--- a/partials/layouts/layout-hero.dust
+++ b/partials/layouts/layout-hero.dust
@@ -1,6 +1,6 @@
-<section {?anchor}id="{anchor|s}"{/anchor}
+<section {?anchor}id="{anchor|attr}"{/anchor}
          class="filharmonia-hero has-background-secondary-dark-invert">
-    <div class="filharmonia-hero__background-container is-relative is-align-items-flex-end is-flex is-justify-content-center has-width-100 {container_class|s}">
+    <div class="filharmonia-hero__background-container is-relative is-align-items-flex-end is-flex is-justify-content-center has-width-100 {container_class|attr}">
         <div class="filharmonia-hero__background is-absolute has-top-0 has-bottom-0 has-right-0 has-left-0 has-background-cover" {@inlinebg id=image size="fullhd" /}></div>
 
         {?overlay}
@@ -8,10 +8,10 @@
         {/overlay}
 
         <div class="filharmonia-hero__text">
-            <div class="container is-flex is-flex-direction-column mb-10 {align|s}">
+            <div class="container is-flex is-flex-direction-column mb-10 {align|attr}">
                 {?title}
                     <h1 class="filharmonia-hero__title h1 mt-0 mr-4 mb-5 ml-4 mr-8-desktop ml-8-desktop is-uppercase no-hyphens has-text-primary-invert">
-                        <span class="pr-{heading_padding_size|s} pl-{heading_padding_size|s}">{title|s}</span>
+                        <span class="pr-{heading_padding_size|attr} pl-{heading_padding_size|attr}">{title|html}</span>
                     </h1>
                 {/title}
 
@@ -46,10 +46,12 @@
                     <div class="column is-6 is-4-desktop has-text-centered">
                         <div class="is-flex is-flex-direction-column has-height-100 p-3 p-6-desktop">
                             <h3 class="mt-0 mb-3">
-                                {title|s}
+                                {title|html}
                             </h3>
 
-                            <div class="mt-0 mb-0 keep-vertical-spacing">{text|s}</div>
+                            <div class="mt-0 mb-0 keep-vertical-spacing">
+                                {text|kses}
+                            </div>
 
                             {?logo}
                                 <div class="image-container">
@@ -59,7 +61,7 @@
 
                             {?link}
                                 <div class="button-container mt-auto">
-                                    {>"ui/button-link" link=link classes="mt-4 is-secondary-invert is-outlined" icon="chevron-right" icon_classes="icon--medium" /}
+                                    {>"ui/button-link" link=link classes="mt-4 is-primary" icon="chevron-right" icon_classes="icon--medium" /}
                                 </div>
                             {/link}
                         </div>
diff --git a/style.css b/style.css
index 82c5840..b2154c7 100644
--- a/style.css
+++ b/style.css
@@ -1,7 +1,7 @@
 /*
  * Theme Name:  TMS Theme Filharmonia
  * Description: Tampere Multisite Filharmonia Theme
- * Version:     1.12.1
+ * Version:     1.12.2
  * Author:      Geniem
  * Author URI:  https://geniem.fi
  * Template:    tms-theme-base