diff --git a/Makefile b/Makefile
index 15603bf2..757be734 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,13 @@ test: always
 serve: /etc/hosts
 	$(hain) 'cd /Sutty/sutty; bundle exec rails s -b "ssl://0.0.0.0:3000?key=../sutty.local/domain/$(SUTTY).key&cert=../sutty.local/domain/$(SUTTY).crt"'
 
+# make rails args="db:migrate"
+rails:
+	$(hain) 'cd /Sutty/sutty; bundle exec rails $(args)'
+
+rake:
+	$(hain) 'cd /Sutty/sutty; bundle exec rake $(args)'
+
 # Servir JS con el dev server.
 # Esto acelera la compilación del javascript, tiene que correrse por separado
 # de serve.
@@ -94,7 +101,7 @@ fa: app/assets/fonts/forkawesome-webfont.woff2 ## Fork Awesome
 
 ota: assets
 	sudo chgrp -R 82 public/
-	rsync -av public/ athshe:/srv/sutty/srv/http/data/_public/
+	rsync -av --delete-after public/ athshe:/srv/sutty/srv/http/data/_public/
 
 # Hotfixes
 ota-rb:
diff --git a/app/models/site.rb b/app/models/site.rb
index 14238e1a..e0aa2040 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -392,7 +392,7 @@ class Site < ApplicationRecord
 
   # Detecta si el tema actual es una gema
   def theme_available?
-    available_themes.include? design.gem
+    available_themes.include? design&.gem
   end
 
   # Devuelve el dominio actual
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9366f9fc..210aeb12 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,5 +1,8 @@
 en:
   dir: ltr
+  en: English
+  es: Castellano 
+  es-AR: Castellano rioplatense 
   locales:
     es:
       name: Castillian Spanish
@@ -335,9 +338,9 @@ en:
     static_file_migration: 'File migration'
     find_and_replace: 'Search and replace'
     index:
-      title: 'Sites'
+      title: 'My Sites'
       pull: 'Upgrade'
-      help: 'This is the list of sites you can edit'
+      help: 'Here are all the sites you can edit'
       visit: 'Visit the site'
       welcome: |
         # Welcome!
@@ -345,12 +348,8 @@ en:
         You have no sites yet.  You can generate all the sites you want
         with the **Create site** button.
 
-        Para ver los cambios, usa el botón **Publicar cambios** en cada
-        sitio y espera unos segundos.  También recibirás un correo de
-        notificación.
-
         To see your changes, use the **Publish changes** button on each
-        site and wait a few seconds.  You'll also receive an e-mail
+        site and wait a few seconds.  You will also receive an e-mail
         notification.
 
         [Create my first site](/sites/new)
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 3a64e7ee..403389ab 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1,4 +1,7 @@
 es:
+  es: Castellano
+  en: English
+  es-AR: Castellano Rioplatense
   dir: ltr
   locales:
     es:
@@ -340,9 +343,9 @@ es:
     static_file_migration: 'Migración de archivos'
     find_and_replace: 'Búsqueda y reemplazo'
     index:
-      title: 'Sitios'
+      title: 'Mis sitios'
       pull: 'Actualizar'
-      help: 'Este es el listado de sitios que puedes editar'
+      help: 'Acá están todos los sitios que puedes editar'
       visit: 'Visitar el sitio'
       welcome: |
         # ¡Bienvenide!