diff --git a/.ruby-version b/.ruby-version
new file mode 100644
index 0000000..b502146
--- /dev/null
+++ b/.ruby-version
@@ -0,0 +1 @@
+3.0.2
diff --git a/_data/home.yml b/_data/home.yml
index 689898c..413f302 100644
--- a/_data/home.yml
+++ b/_data/home.yml
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # This file is sitewide, for all languages.
 # To specify per-language data, use the _i18n folder's yml files.
 
@@ -6,6 +7,37 @@ app_tiles_image: '/assets/images/butter-collection-features-offline-essentials.s
 
 modal:
   butter_app_logo: '/assets/images/butter-app-icon-large.svg'
+=======
+site_name: 'Butter'
+page_logo: ['/assets/images/butter-logo-feature-large.svg', 'Butter App Feature Logo']
+title: 'Life without internet made smoother. <br /> Get access to tools that help.'
+text:
+  show_chat: |
+    This Butter Box offers an Android app store and chat rooms. <br />
+    Download the Butter app to discover and download free, ad-free <br />
+    apps or to spread the love and share apps offline. Or, create a <br />
+    chat room which hangs on to messages while you're gone and <br/>
+    delivers them whenever your device reconnects to the Butter Box.
+  dont_show_chat: |
+    Butter features a collection of apps to make life without <br /> the internet a little smoother.  Use it to discover and download <br /> free, ad-free apps or to spread the love and share offline.
+fdroid_apps_caption: Just a few of the apps available via Butter.
+fdroid_button_text: 'Download Android App'
+chat_button_text: 'Start a chat room instantly'
+image: ['/assets/images/butter-collection-features-offline-essentials.svg', 'Butter App features collection']
+
+modal_data:
+  title: 'Butter: Free, ad-free apps to help you offline'
+  logo: ['/assets/images/butter-app-icon-large.svg', 'Butter App Logo']
+  text: |
+    Be in-the-know, be entertained, manage business and life—even with little internet.
+    Butter app makes it easy to find apps that use less internet and battery.
+    Download your favorites, and get free updates from Butter. Care to share? Send any app on your phone to a friend near you with Butter nearby. No internet needed.
+  info_list:
+    - By Team Butter
+    - Available for Android phones
+    - Less than 10 MB!
+  button_text: 'Download Android App'
+>>>>>>> master
   button_url: '/assets/download/butter.apk'
   slider_list:
     - '/assets/images/slide-img-1.png'
diff --git a/_i18n/es.yml b/_i18n/es.yml
index 09594d5..6446631 100644
--- a/_i18n/es.yml
+++ b/_i18n/es.yml
@@ -1,5 +1,9 @@
 site_name: 'Mantequilla'
+<<<<<<< HEAD:_i18n/es.yml
 page_logo_alt: 'Logo de Mantequilla'
+=======
+page_logo: ['/assets/images/butter-logo-feature-large.svg', 'Butter App Feature Logo']
+>>>>>>> master:_data/es/home.yml
 title: 'Para hacer tu vida sin Internet más fácil. Obtén herramientas que ayudan.'
 text:
   show_chat: |
@@ -8,10 +12,15 @@ text:
    Mantequilla presenta una colección de aplicaciones para ayudarte cuando no tienes acceso a Internet. Úsala para descubrir y descargar aplicaciones gratuitas y sin publicidad o  compartir cuando no tienes conexión.
 fdroid_apps_caption: Unas aplicaciónes disponible de Mantequilla
 fdroid_button_text: 'DESCARGA LA APLICACIÓN ANDROID'
+<<<<<<< HEAD:_i18n/es.yml
 chat_button_text: 'CREA UN SALA DE CHAT'
 app_tiles_image_alt: 'colección de aplicaciones de Mantequilla'
 view_all_apps: 'Ver todas las aplicaciones'
 built_on_fdroid: 'Basado en el software libre F-Droid'
+=======
+chat_button_text: Crea una sala de chat
+image: ['/assets/images/butter-collection-features-offline-essentials.svg', 'Butter App features collection']
+>>>>>>> master:_data/es/home.yml
 
 modal:
   title: 'Mantequilla: aplicaciones gratuitas y sin anuncios para ayudarte cuando no tienes acceso a internet'
diff --git a/_scss/pages/home.scss b/_scss/pages/home.scss
index e45d236..068113f 100644
--- a/_scss/pages/home.scss
+++ b/_scss/pages/home.scss
@@ -93,6 +93,7 @@ a:active {
 .content-area {
   &-wrapper {
     margin-top: 30px;
+    min-height: calc(100vh - 202px);  // take up space above the footer
     margin-bottom: 30px;
     min-height: calc(100vh - 202px);  // take up space above the footer 
     .content-title {