diff --git a/Gemfile.lock b/Gemfile.lock
index 25fcf95..b61e2fd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/HubFeenixMakers/merged
-  revision: b7251ef1355b6a00f3816eb9f6184f42c892867b
+  revision: 6a8dc3f8c6bf28549e80b9a2d8e4e218b0bdf001
   specs:
     merged (0.1.0)
       active_hash
diff --git a/merged/cards.yml b/merged/cards.yml
index 7b995f3..fe688bc 100644
--- a/merged/cards.yml
+++ b/merged/cards.yml
@@ -55,7 +55,7 @@
   :id: 6
   :options:
     background: solid_blue
-    color: white
+    text_color: white
     text_align: center
   :updated_at: &2 2022-12-09 17:50:02.733622073 +02:00
   :section_id: 11
@@ -69,7 +69,7 @@
   :id: 7
   :options:
     background: solid_blue
-    color: white
+    text_color: white
     text_align: right
   :updated_at: *2
   :section_id: 11
@@ -83,7 +83,7 @@
   :image_name: non_standard_room
   :options:
     background: solid_blue
-    color: white
+    text_color: white
     text_align: left
   :updated_at: *2
   :section_id: 11
@@ -96,7 +96,7 @@
     There are about 2-3 per floor, in different sizes, from 12 to 25m2.
   :options:
     background: solid_blue
-    color: white
+    text_color: white
     text_align: left
   :image_name: wet_space_room
   :updated_at: *2
@@ -197,7 +197,7 @@
     background: none
     text_align: center
     subheader: 40 - 120
-    color: none
+    text_color: none
   :image_name: the_hall
   :updated_at: &3 2022-12-09 17:32:41.538163009 +02:00
   :section_id: 15
@@ -212,7 +212,7 @@
     background: none
     text_align: center
     subheader: 30 - 60
-    color: none
+    text_color: none
   :image_name: mandala_room
   :updated_at: *3
   :section_id: 15
@@ -228,7 +228,7 @@
   :options:
     background: light_orange
     text_align: center
-    color: none
+    text_color: none
     subheader: 35 - 80
     order: left
     button_link: SkyConference
@@ -247,7 +247,7 @@
   :options:
     background: light_orange
     text_align: center
-    color: none
+    text_color: none
     subheader: 15 - 30
   :updated_at: *3
   :section_id: 15
@@ -262,7 +262,7 @@
   :options:
     background: none
     text_align: center
-    color: none
+    text_color: none
     subheader: 10 - 25
   :updated_at: *3
   :section_id: 15
@@ -277,7 +277,7 @@
   :options:
     background: light_grey
     text_align: center
-    color: none
+    text_color: none
     subheader: 8-15
   :updated_at: *3
   :section_id: 15
@@ -352,7 +352,7 @@
     possible per day, 10e."
   :options:
     background: solid_blue
-    color: white
+    text_color: white
     order: left
     text_align: center
     subheader: 120 / month
@@ -367,7 +367,7 @@
     office. We provide desk, chair, shelves and wifi
   :options:
     background: solid_blue
-    color: white
+    text_color: white
     order: right
     text_align: center
     subheader: 200 / month
@@ -382,7 +382,7 @@
     to your needs.\r\n"
   :options:
     background: solid_blue
-    color: white
+    text_color: white
     order: left
     text_align: center
     subheader: 350 / month
@@ -447,7 +447,7 @@
   :image_name: service_cafe
   :options:
     background: light_gray
-    color: solid_blue
+    text_color: solid_blue
     text_align: center
     subheader: ''
   :updated_at: &5 2022-12-10 20:28:17.967357225 +02:00
@@ -461,7 +461,7 @@
   :image_name: service_treatments
   :options:
     background: light_gray
-    color: solid_blue
+    text_color: solid_blue
     text_align: center
     subheader: ''
   :updated_at: *5
@@ -475,7 +475,7 @@
   :image_name: service_boutique
   :options:
     background: light_gray
-    color: solid_blue
+    text_color: solid_blue
     text_align: center
     subheader: ''
   :updated_at: *5
@@ -539,7 +539,7 @@
     dining area.
   :options:
     background: none
-    color: none
+    text_color: none
     text_align: center
   :updated_at: 2023-01-04 20:04:12.550687408 +02:00
   :updated_by: maijanposteja@gmail.com
@@ -552,7 +552,7 @@
     available.
   :options:
     background: none
-    color: none
+    text_color: none
     text_align: center
     order: left
   :updated_at: 2023-01-04 20:03:12.804727029 +02:00
@@ -566,7 +566,7 @@
     or use our Cafe in the ground floor.
   :options:
     background: light_orange
-    color: none
+    text_color: none
     order: left
     text_align: center
     subheader: ''
@@ -583,7 +583,7 @@
     Vegan options"
   :options:
     background: light_orange
-    color: none
+    text_color: none
     order: left
     text_align: center
     button_link: ''
@@ -599,7 +599,7 @@
     25 people. \r\nDelicious vegetarian food with vegan options."
   :options:
     background: light_orange
-    color: none
+    text_color: none
     order: left
     text_align: center
     button_link: ''
@@ -616,7 +616,7 @@
     available, no own"
   :options:
     background: light_orange
-    color: none
+    text_color: none
     text_align: center
     button_link: ''
     button_text: ''
@@ -633,7 +633,7 @@
     and Treatments\r\n- Horse Riding"
   :options:
     background: light_orange
-    color: none
+    text_color: none
     text_align: center
     button_link: ''
     button_text: ''
@@ -649,7 +649,7 @@
     send us a mail."
   :options:
     background: light_orange
-    color: black
+    text_color: black
     text_align: center
     button_link: ''
     button_text: ''
diff --git a/merged/pages.yml b/merged/pages.yml
index feb29e8..b1ed2ea 100644
--- a/merged/pages.yml
+++ b/merged/pages.yml
@@ -20,7 +20,6 @@
   :updated_at: 2022-12-08 19:11:48.243621696 +02:00
   :id: 5
   :type: page
-  :redirects: about3 about2
   :options: {}
 - :name: index
   :updated_at: 2022-12-10 20:28:17.967357225 +02:00
diff --git a/merged/sections.yml b/merged/sections.yml
index 3a84c0a..9f55794 100644
--- a/merged/sections.yml
+++ b/merged/sections.yml
@@ -17,7 +17,7 @@
   :options:
     order: left
     background: white
-    color: none
+    text_color: none
     subheader: ''
     text: ''
     text_align: center
@@ -34,7 +34,7 @@
     facilities, see below."
   :options:
     background: light_gray
-    color: black
+    text_color: black
     margin: '0'
     subheader: Sharing machines and experiences
     button_link: ''
@@ -56,7 +56,7 @@
   :options:
     subheader: Printing, scanning and planning
     order: left
-    color: black
+    text_color: black
     background: light_gray
     margin: '0'
   :image_name: 3dprinter_wide
@@ -76,7 +76,7 @@
   :options:
     subheader: Express your style
     order: right
-    color: none
+    text_color: none
     background: light_gray
     margin: '0'
   :updated_at: *1
@@ -96,7 +96,7 @@
     subheader: Useful and practical
     margin: '0'
     order: left
-    color: none
+    text_color: none
     background: light_gray
   :updated_at: *1
   :page_id: 1
@@ -114,7 +114,7 @@
     subheader: Wizz wizz wizz
     margin: '0'
     order: right
-    color: none
+    text_color: none
     background: light_gray
   :updated_at: *1
   :page_id: 1
@@ -131,7 +131,7 @@
     subheader: Sculptured or turned
     margin: '0'
     order: left
-    color: none
+    text_color: none
     background: light_gray
   :updated_at: *1
   :page_id: 1
@@ -149,7 +149,7 @@
     subheader: ''
     margin: '0'
     order: right
-    color: none
+    text_color: none
     background: light_gray
   :updated_at: *1
   :page_id: 1
@@ -173,7 +173,7 @@
     ok_message: ''
     handler: FormHandler
     background: light_orange
-    color: solid_black
+    text_color: solid_black
   :updated_at: *1
   :page_id: 1
   :index: 9
@@ -210,7 +210,7 @@
     button_text: ''
     background: light_blue
     columns: '2'
-    color: none
+    text_color: none
     text_align: center
     item_align: center
   :updated_at: 2023-01-01 11:56:46.422704011 +02:00
@@ -229,7 +229,7 @@
     columns: '3'
     button_link: ''
     button_text: ''
-    color: none
+    text_color: none
     text_align: center
     item_align: center
   :updated_at: 2022-12-23 21:31:07.736507521 +02:00
@@ -244,7 +244,7 @@
     ok_message: Ok
     handler: FormHandler
     background: light_orange
-    color: none
+    text_color: none
   :header: The deal
   :text: "Hub Feenix is not just renting space, we are looking to build a community
     of active, participating creatives.\r\n\r\nCheck out the MakerSpace facilities
@@ -269,7 +269,7 @@
     background: white
     subheader: Come to learn, enjoy your stay
     text_align: center
-    color: solid_blue
+    text_color: solid_blue
   :image_name: retreats
   :updated_at: 2023-01-14 13:19:27.302295214 +02:00
   :page_id: 3
@@ -286,7 +286,7 @@
     columns: '3'
     button_link: ''
     button_text: ''
-    color: solid_blue
+    text_color: solid_blue
     text_align: center
     item_align: center
   :updated_at: 2022-12-23 21:27:03.197415146 +02:00
@@ -305,7 +305,7 @@
   :image_id:
   :options:
     background: white
-    color: solid_blue
+    text_color: solid_blue
     margin: '0'
     subheader: ''
     text_align: center
@@ -321,7 +321,7 @@
   :options:
     fixed: 'off'
     shade_color: solid_blue_25
-    color: white
+    text_color: white
     text_align: left
     item_align: left
     image_align: center
@@ -338,7 +338,7 @@
   :image_name: shared_wide
   :options:
     fixed: 'off'
-    color: white
+    text_color: white
     text_align: right
     shade_color: solid_red_25
     item_align: right
@@ -357,7 +357,7 @@
   :image_name: common_wide
   :options:
     fixed: 'off'
-    color: white
+    text_color: white
     text_align: center
     shade_color: black_25
     item_align: center
@@ -373,7 +373,7 @@
   :text: Relax outside the course program
   :options:
     background: light_orange
-    color: solid_blue
+    text_color: solid_blue
     button_link: ''
     button_text: ''
     margin: '0'
@@ -390,7 +390,7 @@
   :image_name: common_spaces_wide
   :options:
     fixed: 'on'
-    color: solid_blue
+    text_color: solid_blue
     text_align: left
     background: light_orange
   :header: Common spaces
@@ -408,7 +408,7 @@
     is conveniently situated next to the hall, so smaller breaks don't stop your flow.
   :options:
     fixed: 'on'
-    color: solid_blue
+    text_color: solid_blue
     text_align: left
     background: light_orange
     order: right
@@ -424,7 +424,7 @@
     the summer) go swimming in the nearby lake.
   :options:
     order: left
-    color: solid_blue
+    text_color: solid_blue
     background: light_orange
   :updated_at: *2
   :page_id: 3
@@ -440,7 +440,7 @@
     ok_message: ''
     handler: FormHandler
     background: light_gray
-    color: solid_blue
+    text_color: solid_blue
   :updated_at: *2
   :page_id: 3
   :index: 11
@@ -455,7 +455,7 @@
   :options:
     order: left
     background: white
-    color: solid_blue
+    text_color: solid_blue
     subheader: ''
     text: ''
     text_align: center
@@ -475,7 +475,7 @@
   :options:
     background: light_orange
     columns: '3'
-    color: solid_blue
+    text_color: solid_blue
     text_align: center
     item_align: center
   :updated_at: 2022-12-23 21:42:47.526207356 +02:00
@@ -492,7 +492,7 @@
     ok_message: ''
     handler: FormHandler
     background: light_orange
-    color: solid_blue
+    text_color: solid_blue
   :updated_at: *3
   :page_id: 4
   :index: 3
@@ -506,7 +506,7 @@
     check later, or follow us on facebook."
   :options:
     fixed: 'off'
-    color: white
+    text_color: white
     text_align: left
     shade_color: solid_blue_25
     item_align: left
@@ -530,7 +530,7 @@
     residencies, and other gatherings."
   :options:
     background: light_orange
-    color: solid_blue
+    text_color: solid_blue
     margin: '0'
     subheader: ''
     button_link: ''
@@ -548,7 +548,7 @@
   :image_name: map_wide
   :options:
     fixed: 'on'
-    color: black
+    text_color: black
     text_align: left
     shade_color: none
     item_align: left
@@ -567,7 +567,7 @@
   :options:
     fixed: 'on'
     shade_color: black_25
-    color: white
+    text_color: white
     text_align: center
     item_align: left
     image_align: center
@@ -642,7 +642,7 @@
   :options:
     order: right
     background: solid_blue
-    color: none
+    text_color: none
     subheader: ''
     text: ''
     text_align: left
@@ -662,7 +662,7 @@
   :options:
     order: left
     background: solid_blue
-    color: none
+    text_color: none
     subheader: ''
     text: ''
     text_align: left
@@ -683,7 +683,7 @@
   :options:
     order: right
     background: solid_blue
-    color: none
+    text_color: none
     subheader: ''
     text: ''
     text_align: left
@@ -701,7 +701,7 @@
   :options:
     background: solid_blue
     columns: '3'
-    color: none
+    text_color: none
     text_align: center
     item_align: center
   :updated_at: 2022-12-23 21:47:55.654872333 +02:00
@@ -716,7 +716,7 @@
   :text: "Högbenintie 30, 10350 Meltola, Raasepori\r\n\r\ninfo@hubfeenix.fi\r\n\r\n0505337881\r\n"
   :options:
     background: white
-    color: solid_blue
+    text_color: solid_blue
     ok_message: We'll get back to you
   :updated_at: *4
   :page_id: 6
@@ -738,7 +738,7 @@
   :options:
     columns: '2'
     background: white
-    color: none
+    text_color: none
     margin: '0'
     subheader: ''
   :header: ''
@@ -755,7 +755,7 @@
   :id: 44
   :options:
     fixed: 'off'
-    color: white
+    text_color: white
     text_align: center
     item_align: center
     image_align: center
@@ -770,7 +770,7 @@
   :header: ''
   :text: ''
   :options:
-    color: black
+    text_color: black
     text_align: center
     item_align: center
     image_align: center
@@ -801,7 +801,7 @@
     background: white
     columns: '4'
     subheader: ''
-    color: none
+    text_color: none
     text_align: left
   :image_id: 0
   :header: Packages