diff --git a/app/views/admin/admin_users/_admin_user.html.haml b/app/views/admin/admin_users/_admin_user.html.haml
index b683c23..c839cff 100644
--- a/app/views/admin/admin_users/_admin_user.html.haml
+++ b/app/views/admin/admin_users/_admin_user.html.haml
@@ -2,6 +2,6 @@
   %td= admin_user.email
   %td= admin_user.last_sign_in_at
   %td= admin_user.last_sign_in_ip
-  %td{ :class => :actions }
+  %td{ class: :actions }
     - unless admin_user == current_admin_user
-      = link_to "Delete", admin_admin_user_path(admin_user), method: :delete, confirm: "Are you sure you wish to delete this Admin User?"
+      = link_to 'Delete', admin_admin_user_path(admin_user), method: :delete, confirm: 'Are you sure you wish to delete this Admin User?'
diff --git a/app/views/admin/admin_users/edit.html.haml b/app/views/admin/admin_users/edit.html.haml
index ff8752b..2bd8e0b 100644
--- a/app/views/admin/admin_users/edit.html.haml
+++ b/app/views/admin/admin_users/edit.html.haml
@@ -1,2 +1,2 @@
 %h2 Edit Admin User
-= render partial: "form", locals: { admin_user: @admin_user }
+= render 'form', admin_user: @admin_user
diff --git a/app/views/admin/admin_users/edit_password.html.haml b/app/views/admin/admin_users/edit_password.html.haml
index 7b9cc0c..fde4917 100644
--- a/app/views/admin/admin_users/edit_password.html.haml
+++ b/app/views/admin/admin_users/edit_password.html.haml
@@ -1,11 +1,11 @@
 %h3 Change your password
 
-= simple_form_for(@admin_user, :url => update_password_admin_admin_user_path, html: { method: :put }) do |f|
+= simple_form_for(@admin_user, url: update_password_admin_admin_user_path, html: { method: :put }) do |f|
   = inputs_field_set do
     = f.input :current_password
   = inputs_field_set do
-    = f.input :password, label: "New Password"
-    = f.input :password_confirmation, label: "Confirm Password"
+    = f.input :password, label: 'New Password'
+    = f.input :password_confirmation, label: 'Confirm Password'
 
   = actions_field_set do
-    = f.submit "Change my password"
+    = f.submit 'Change my password'
diff --git a/app/views/admin/admin_users/index.html.haml b/app/views/admin/admin_users/index.html.haml
index ff34a15..bb19300 100644
--- a/app/views/admin/admin_users/index.html.haml
+++ b/app/views/admin/admin_users/index.html.haml
@@ -8,7 +8,7 @@
       %th IP Address
       %th
   %tbody
-    = render partial: "admin_user", collection: @admin_users
+    = render partial: 'admin_user', collection: @admin_users
   %tfoot
     %tr
       %td{ colspan: 4 }
diff --git a/app/views/admin/admin_users/new.html.haml b/app/views/admin/admin_users/new.html.haml
index 850698d..4dbf62f 100644
--- a/app/views/admin/admin_users/new.html.haml
+++ b/app/views/admin/admin_users/new.html.haml
@@ -1,2 +1,2 @@
 %h2 New Admin User
-= render partial: "form", locals: { admin_user: @admin_user }
+= render 'form', admin_user: @admin_user
diff --git a/app/views/admin/categories/edit.html.haml b/app/views/admin/categories/edit.html.haml
index 9e8ee6e..f60e1d3 100644
--- a/app/views/admin/categories/edit.html.haml
+++ b/app/views/admin/categories/edit.html.haml
@@ -1,2 +1,2 @@
 %h2 Edit Category
-= render partial: "form", locals: { category: @category }
+= render 'form', category: @category
diff --git a/app/views/admin/categories/new.html.haml b/app/views/admin/categories/new.html.haml
index 54f0590..08bd551 100644
--- a/app/views/admin/categories/new.html.haml
+++ b/app/views/admin/categories/new.html.haml
@@ -1,2 +1,2 @@
 %h2 New Category
-= render partial: "form", locals: { category: @category }
+= render 'form', category: @category
diff --git a/app/views/admin/confirmations/new.html.haml b/app/views/admin/confirmations/new.html.haml
index f0553d9..778026a 100644
--- a/app/views/admin/confirmations/new.html.haml
+++ b/app/views/admin/confirmations/new.html.haml
@@ -6,6 +6,6 @@
     = f.input :email
 
   = actions_field_set do
-    = f.submit "Resend confirmation instructions"
+    = f.submit 'Resend confirmation instructions'
 
-= render partial: "devise/shared/links"
+= render 'devise/shared/links'
diff --git a/app/views/admin/confirmations/show.html.haml b/app/views/admin/confirmations/show.html.haml
index 3919c9a..5708eb9 100644
--- a/app/views/admin/confirmations/show.html.haml
+++ b/app/views/admin/confirmations/show.html.haml
@@ -9,4 +9,4 @@
         = f.input :password_confirmation, :label 'Confirm Password'
       = hidden_field_tag :confirmation_token, @confirmation_token
   = f.actions do
-    = f.submit "Activate"
+    = f.submit 'Activate'
diff --git a/app/views/admin/layouts/admin.html.haml b/app/views/admin/layouts/admin.html.haml
index d050ce0..a62931c 100644
--- a/app/views/admin/layouts/admin.html.haml
+++ b/app/views/admin/layouts/admin.html.haml
@@ -2,13 +2,13 @@
 %html
   %head
     %title= "#{APP_CONFIG['name']} Admin"
-    = stylesheet_link_tag    "admin"
-    = javascript_include_tag "admin"
+    = stylesheet_link_tag    'admin'
+    = javascript_include_tag 'admin'
     = csrf_meta_tag
 
   %body
     #page
-      %header{ role: "banner" }= render partial: "admin/shared/header"
-      = render partial: "shared/flash_messages"
+      %header{ role: 'banner' }= render 'admin/shared/header'
+      = render 'shared/flash_messages'
       = yield
-      %footer{ role: "footer" }= render partial: "admin/shared/footer"
+      %footer{ role: 'footer' }= render 'admin/shared/footer'
diff --git a/app/views/admin/layouts/login.html.haml b/app/views/admin/layouts/login.html.haml
index 7dc271d..409a66f 100644
--- a/app/views/admin/layouts/login.html.haml
+++ b/app/views/admin/layouts/login.html.haml
@@ -2,12 +2,12 @@
 %html
   %head
     %title= "#{APP_CONFIG['name']} Admin"
-    = stylesheet_link_tag    "admin"
-    = javascript_include_tag "admin"
+    = stylesheet_link_tag    'admin'
+    = javascript_include_tag 'admin'
     = csrf_meta_tag
 
   %body
     #login
-      %header{ role: "banner" }= render partial: "admin/shared/login_header"
-      = render partial: "shared/flash_messages"
+      %header{ role: 'banner' }= render 'admin/shared/login_header'
+      = render 'shared/flash_messages'
       = yield
diff --git a/app/views/admin/pages/edit.html.haml b/app/views/admin/pages/edit.html.haml
index 8584005..f602114 100644
--- a/app/views/admin/pages/edit.html.haml
+++ b/app/views/admin/pages/edit.html.haml
@@ -1,2 +1,2 @@
 %h2 Edit Page
-= render :partial => "form", :locals => { :page => @page }
\ No newline at end of file
+= render 'form', page: @page
diff --git a/app/views/admin/pages/index.html.haml b/app/views/admin/pages/index.html.haml
index 603f85b..8f6e696 100644
--- a/app/views/admin/pages/index.html.haml
+++ b/app/views/admin/pages/index.html.haml
@@ -7,7 +7,7 @@
       %th Title
       %th
   %tbody
-    = render partial: "page", collection: @pages
+    = render partial: 'page', collection: @pages
   %tfoot
     %tr
       %td{ colspan: 4 }
diff --git a/app/views/admin/photos/_form.html.haml b/app/views/admin/photos/_form.html.haml
index 2733958..5b472bf 100644
--- a/app/views/admin/photos/_form.html.haml
+++ b/app/views/admin/photos/_form.html.haml
@@ -2,7 +2,7 @@
   %ul.categories
     - @categories.each do |photo_category|
       %li
-        = check_box_tag "photo[category_ids][]", photo_category.id, @photo.categories.include?(photo_category), id: "photo_category_ids_#{photo_category.id}"
+        = check_box_tag 'photo[category_ids][]', photo_category.id, @photo.categories.include?(photo_category), id: "photo_category_ids_#{photo_category.id}"
         = label_tag "photo_category_ids_#{photo_category.id}", photo_category.name
 
   = inputs_field_set do
diff --git a/app/views/admin/sessions/new.html.haml b/app/views/admin/sessions/new.html.haml
index 4299c75..3f1e2c3 100644
--- a/app/views/admin/sessions/new.html.haml
+++ b/app/views/admin/sessions/new.html.haml
@@ -9,6 +9,6 @@
       = f.input :remember_me, as: :boolean
 
   = actions_field_set do
-    = f.submit "Sign In"
+    = f.submit 'Sign In'
 
-= render partial: "devise/shared/links"
+= render 'devise/shared/links'
diff --git a/app/views/admin/shared/_header.html.haml b/app/views/admin/shared/_header.html.haml
index b0c8d4a..3f634f2 100644
--- a/app/views/admin/shared/_header.html.haml
+++ b/app/views/admin/shared/_header.html.haml
@@ -1,3 +1,3 @@
 %h1= link_to APP_CONFIG['name'], admin_dashboard_path
-= render "admin/shared/user"
-= render "admin/shared/menu"
+= render 'admin/shared/user'
+= render 'admin/shared/menu'
diff --git a/app/views/admin/shared/_menu.html.haml b/app/views/admin/shared/_menu.html.haml
index e3e06b6..4496dfc 100644
--- a/app/views/admin/shared/_menu.html.haml
+++ b/app/views/admin/shared/_menu.html.haml
@@ -1,4 +1,4 @@
 %nav
   %ul
     - @admin_menu.each do |key, value|
-      = render partial: "admin/shared/menu_item", locals: { menu_item: key }
+      = render 'admin/shared/menu_item', menu_item: key
diff --git a/app/views/admin/shared/_menu_item.html.haml b/app/views/admin/shared/_menu_item.html.haml
index c61fc8f..43c87f0 100644
--- a/app/views/admin/shared/_menu_item.html.haml
+++ b/app/views/admin/shared/_menu_item.html.haml
@@ -1 +1 @@
-%li= link_to menu_item.to_s.gsub(/_/, ' ').titleize, { controller: menu_item }, class: (params[:controller] == "admin/" + menu_item.to_s ? "selected" : nil)
+%li= link_to menu_item.to_s.gsub(/_/, ' ').titleize, { controller: menu_item }, class: (params[:controller] == "admin/#{menu_item}" ? 'selected' : nil)
diff --git a/app/views/admin/shared/_user.html.haml b/app/views/admin/shared/_user.html.haml
index 58bfac4..77ad56d 100644
--- a/app/views/admin/shared/_user.html.haml
+++ b/app/views/admin/shared/_user.html.haml
@@ -1,6 +1,6 @@
 #user
   %strong= current_admin_user.email
   |
-  = link_to "Change Password", edit_password_admin_admin_user_path
+  = link_to 'Change Password', edit_password_admin_admin_user_path
   |
-  = link_to "Logout", destroy_admin_user_session_path, method: :delete
+  = link_to 'Logout', destroy_admin_user_session_path, method: :delete
diff --git a/app/views/admin/unlocks/new.html.haml b/app/views/admin/unlocks/new.html.haml
index 6dfce96..ea55081 100644
--- a/app/views/admin/unlocks/new.html.haml
+++ b/app/views/admin/unlocks/new.html.haml
@@ -6,6 +6,6 @@
     = f.input :email
 
   = actions_field_set do
-    = f.submit "Resend unlock instructions"
+    = f.submit 'Resend unlock instructions'
 
-= render partial: "devise/shared/links"
+= render partial: 'devise/shared/links'