diff --git a/.formatter.exs b/.formatter.exs
index d2cda26ed..d491bed1c 100644
--- a/.formatter.exs
+++ b/.formatter.exs
@@ -1,4 +1,6 @@
 # Used by "mix format"
 [
-  inputs: ["{mix,.formatter}.exs", "{config,lib,test}/**/*.{ex,exs}"]
+  plugins: [Phoenix.LiveView.HTMLFormatter],
+  inputs: ["{mix,.formatter}.exs", "{config,lib,test}/**/*.{heex,ex,exs}"],
+  heex_line_length: 200
 ]
diff --git a/lib/nerves_hub_web/templates/account/delete.html.heex b/lib/nerves_hub_web/templates/account/delete.html.heex
index a267effc0..773e89619 100644
--- a/lib/nerves_hub_web/templates/account/delete.html.heex
+++ b/lib/nerves_hub_web/templates/account/delete.html.heex
@@ -5,10 +5,10 @@
 <%= form_for @conn, Routes.account_path(@conn, :delete, @user.username), [method: "delete"], fn f -> %>
   <div class="form-group">
     <label for="username_input">Please type <%= @user.username %> to confirm.</label>
-    <%= text_input f, :confirm_username, class: "form-control", id: "username_input" %>
+    <%= text_input(f, :confirm_username, class: "form-control", id: "username_input") %>
   </div>
 
   <div class="button-submit-wrapper">
-    <%= submit "I understand the consequences, delete this account", class: "btn btn-primary" %>
+    <%= submit("I understand the consequences, delete this account", class: "btn btn-primary") %>
   </div>
 <% end %>
diff --git a/lib/nerves_hub_web/templates/account/edit.html.heex b/lib/nerves_hub_web/templates/account/edit.html.heex
index 8722ac250..f69cce2f1 100644
--- a/lib/nerves_hub_web/templates/account/edit.html.heex
+++ b/lib/nerves_hub_web/templates/account/edit.html.heex
@@ -3,44 +3,42 @@
 </h1>
 
 <div class="mb-4">
-  <%=
-    link(
-      "Delete Account",
-      class: "btn btn-outline-light",
-      aria_label: "Delete Account",
-      to: Routes.account_path(@conn, :confirm_delete, @user.username)
-    )
-  %>
+  <%= link(
+    "Delete Account",
+    class: "btn btn-outline-light",
+    aria_label: "Delete Account",
+    to: Routes.account_path(@conn, :confirm_delete, @user.username)
+  ) %>
 </div>
 
 <%= form_for @changeset, Routes.account_path(@conn, :update, @user.username), fn f -> %>
   <div class="form-group">
     <label for="username_input">Username</label>
-    <%= text_input f, :username, class: "form-control", id: "username_input" %>
-    <div class="has-error"><%= error_tag f, :username %></div>
+    <%= text_input(f, :username, class: "form-control", id: "username_input") %>
+    <div class="has-error"><%= error_tag(f, :username) %></div>
   </div>
 
   <div class="form-group">
     <label for="email_input">Email</label>
-    <%= email_input f, :email, class: "form-control", id: "email_input" %>
-    <div class="has-error"><%= error_tag f, :email %></div>
+    <%= email_input(f, :email, class: "form-control", id: "email_input") %>
+    <div class="has-error"><%= error_tag(f, :email) %></div>
   </div>
 
   <h4 class="color-white mt-4 mb-2">Change Password</h4>
 
   <div class="form-group">
     <label for="current_password_input">Old Password</label>
-    <%= password_input f, :current_password, class: "form-control", id: "current_password_input" %>
-    <div class="has-error"><%= error_tag f, :current_password %></div>
+    <%= password_input(f, :current_password, class: "form-control", id: "current_password_input") %>
+    <div class="has-error"><%= error_tag(f, :current_password) %></div>
   </div>
 
   <div class="form-group">
     <label for="password_input">New Password</label>
-    <%= password_input f, :password, class: "form-control", id: "password_input" %>
-    <div class="has-error"><%= error_tag f, :password %></div>
+    <%= password_input(f, :password, class: "form-control", id: "password_input") %>
+    <div class="has-error"><%= error_tag(f, :password) %></div>
   </div>
 
   <div class="button-submit-wrapper">
-    <%= submit "Save Changes", class: "btn btn-primary" %>
+    <%= submit("Save Changes", class: "btn btn-primary") %>
   </div>
 <% end %>
diff --git a/lib/nerves_hub_web/templates/account/invite.html.heex b/lib/nerves_hub_web/templates/account/invite.html.heex
index 7bace3848..a5b6a7c23 100644
--- a/lib/nerves_hub_web/templates/account/invite.html.heex
+++ b/lib/nerves_hub_web/templates/account/invite.html.heex
@@ -2,20 +2,20 @@
   <h2 class="form-title">
     Create New Account
   </h2>
-  <h5 class="mt-2"><%= gettext "You will be added to the %{organization_name} organization", organization_name: @org.name %></h5>
+  <h5 class="mt-2"><%= gettext("You will be added to the %{organization_name} organization", organization_name: @org.name) %></h5>
 
   <%= form_for @changeset, Routes.account_path(@conn, :accept_invite, @token), [as: :user, method: "post", class: "form-page"], fn f -> %>
     <div class="form-group">
       <label for="username_input">Username</label>
-      <%= text_input f, :username, class: "form-control", id: "username_input" %>
-      <div class="has-error"><%= error_tag f, :username %></div>
+      <%= text_input(f, :username, class: "form-control", id: "username_input") %>
+      <div class="has-error"><%= error_tag(f, :username) %></div>
     </div>
     <div class="form-group">
       <label for="password_input">Password</label>
-      <%= password_input f, :password, class: "form-control", id: "password_input" %>
-      <div class="has-error"><%= error_tag f, :password %></div>
+      <%= password_input(f, :password, class: "form-control", id: "password_input") %>
+      <div class="has-error"><%= error_tag(f, :password) %></div>
     </div>
 
-    <%= submit "Register", class: "btn btn-primary btn-lg w-100" %>
+    <%= submit("Register", class: "btn btn-primary btn-lg w-100") %>
   <% end %>
 </div>
diff --git a/lib/nerves_hub_web/templates/archive/index.html.heex b/lib/nerves_hub_web/templates/archive/index.html.heex
index 7ec8c879c..379aa1379 100644
--- a/lib/nerves_hub_web/templates/archive/index.html.heex
+++ b/lib/nerves_hub_web/templates/archive/index.html.heex
@@ -75,7 +75,12 @@
             <div class="dropdown-menu dropdown-menu-right">
               <%= link("Download", class: "dropdown-item", to: Routes.archive_path(@conn, :download, @org.name, @product.name, archive.uuid)) %>
               <div class="dropdown-divider"></div>
-              <%= link "Delete", class: "dropdown-item", to: Routes.archive_path(@conn, :delete, @org.name, @product.name, archive.uuid), method: :delete, data: [confirm: "Are you sure you want to delete this archive? This can not be undone."] %>
+              <%= link("Delete",
+                class: "dropdown-item",
+                to: Routes.archive_path(@conn, :delete, @org.name, @product.name, archive.uuid),
+                method: :delete,
+                data: [confirm: "Are you sure you want to delete this archive? This can not be undone."]
+              ) %>
             </div>
           </div>
         </td>
diff --git a/lib/nerves_hub_web/templates/audit_log/_audit_log_feed.html.heex b/lib/nerves_hub_web/templates/audit_log/_audit_log_feed.html.heex
index 7eda467de..d505bf534 100644
--- a/lib/nerves_hub_web/templates/audit_log/_audit_log_feed.html.heex
+++ b/lib/nerves_hub_web/templates/audit_log/_audit_log_feed.html.heex
@@ -6,7 +6,7 @@
   <% else %>
     <%= for audit_log <- @audit_logs do %>
       <div class="audit-log-item" id={audit_log.id}>
-        <div class={"audit-action-icon icon-update"}></div>
+        <div class="audit-action-icon icon-update"></div>
         <div>
           <p class="audit-description"><%= audit_log.description %></p>
           <div class="help-text">
diff --git a/lib/nerves_hub_web/templates/deployment/edit.html.heex b/lib/nerves_hub_web/templates/deployment/edit.html.heex
index 09a8c618c..d2f7bf836 100644
--- a/lib/nerves_hub_web/templates/deployment/edit.html.heex
+++ b/lib/nerves_hub_web/templates/deployment/edit.html.heex
@@ -1,4 +1,4 @@
-<%= link "Back to Deployment", to: Routes.deployment_path(@conn, :show, @org.name, @product.name, @deployment.name), class: "back-link"%>
+<%= link("Back to Deployment", to: Routes.deployment_path(@conn, :show, @org.name, @product.name, @deployment.name), class: "back-link") %>
 <h1>Edit Deployment</h1>
 
 <h5 class="mb-2">Firmware version details</h5>
@@ -10,12 +10,10 @@
   <div>
     <div class="help-text mb-1">Version</div>
     <p>
-      <%=
-          case @firmware.version do
-            nil -> "--"
-            version -> version
-          end
-        %>
+      <%= case @firmware.version do
+        nil -> "--"
+        version -> version
+      end %>
     </p>
   </div>
   <div>
@@ -31,12 +29,12 @@
 <div class="divider"></div>
 
 <%= form_for @changeset, Routes.deployment_path(@conn, :update, @org.name, @product.name, @deployment.name), [as: :deployment], fn f -> %>
-  <%= hidden_input f, :firmware_id, value: @firmware.id %>
+  <%= hidden_input(f, :firmware_id, value: @firmware.id) %>
 
   <div class="form-group">
     <label for="name_input">Deployment name</label>
-    <%= text_input f, :name, class: "form-control", id: "name_input" %>
-    <div class="has-error"><%= error_tag f, :name %></div>
+    <%= text_input(f, :name, class: "form-control", id: "name_input") %>
+    <div class="has-error"><%= error_tag(f, :name) %></div>
   </div>
 
   <div class="form-group">
@@ -45,9 +43,9 @@
       <span class="tooltip-info"></span>
       <span class="tooltip-text">Firmware listed is the same platform and architecture as the currently selected firmware.</span>
     </label>
-    <%= select f, :firmware_id, firmware_dropdown_options(@firmwares), required: true, id: "firmware_id", class: "form-control" %>
+    <%= select(f, :firmware_id, firmware_dropdown_options(@firmwares), required: true, id: "firmware_id", class: "form-control") %>
     <div class="select-icon"></div>
-    <div class="has-error"><%= error_tag f, :firmware_id %></div>
+    <div class="has-error"><%= error_tag(f, :firmware_id) %></div>
   </div>
 
   <h3 class="mb-2">Conditions</h3>
@@ -60,15 +58,15 @@
       <span class="tooltip-info"></span>
       <span class="tooltip-text">Changing tags will reset all devices on this deployment</span>
     </label>
-    <%= text_input f, :tags,
-        class: "form-control",
-        id: "tags_input",
-        value:
-          @changeset
-          |> Ecto.Changeset.get_change(:conditions, %{})
-          |> Map.get("tags", "")
-      %>
-    <div class="has-error"><%= error_tag f, :tags %></div>
+    <%= text_input(f, :tags,
+      class: "form-control",
+      id: "tags_input",
+      value:
+        @changeset
+        |> Ecto.Changeset.get_change(:conditions, %{})
+        |> Map.get("tags", "")
+    ) %>
+    <div class="has-error"><%= error_tag(f, :tags) %></div>
   </div>
 
   <div class="form-group">
@@ -77,15 +75,15 @@
       <span class="tooltip-info"></span>
       <span class="tooltip-text">Changing the version requirement will reset all devices on this deployment</span>
     </label>
-    <%= text_input f, :version,
-          class: "form-control",
-          id: "version_requirement",
-          value:
-            @changeset
-            |> Ecto.Changeset.get_change(:conditions, %{})
-            |> Map.get("version", "")
-        %>
-    <div class="has-error"><%= error_tag f, :version %></div>
+    <%= text_input(f, :version,
+      class: "form-control",
+      id: "version_requirement",
+      value:
+        @changeset
+        |> Ecto.Changeset.get_change(:conditions, %{})
+        |> Map.get("version", "")
+    ) %>
+    <div class="has-error"><%= error_tag(f, :version) %></div>
   </div>
 
   <h3 class="mb-2">Rolling Updates</h3>
@@ -96,8 +94,8 @@
       <span class="tooltip-info"></span>
       <span class="tooltip-text">The number of devices that will update at any given time. This is a soft limit and concurrent updates may be slightly above this number.</span>
     </label>
-    <%= number_input f, :concurrent_updates, class: "form-control", id: "concurrent_updates" %>
-    <div class="has-error"><%= error_tag f, :concurrent_updates %></div>
+    <%= number_input(f, :concurrent_updates, class: "form-control", id: "concurrent_updates") %>
+    <div class="has-error"><%= error_tag(f, :concurrent_updates) %></div>
   </div>
 
   <div class="form-group">
@@ -106,10 +104,9 @@
       <span class="tooltip-info"></span>
       <span class="tooltip-text">The number of minutes before an inflight update expires to clear the queue</span>
     </label>
-    <%= number_input f, :inflight_update_expiration_minutes, class: "form-control", id: "concurrent_updates" %>
-    <div class="has-error"><%= error_tag f, :inflight_update_expiration_minutes %></div>
+    <%= number_input(f, :inflight_update_expiration_minutes, class: "form-control", id: "concurrent_updates") %>
+    <div class="has-error"><%= error_tag(f, :inflight_update_expiration_minutes) %></div>
   </div>
-
   <!-- Advanced Options -->
   <button class="btn btn-outline-light mb-4" type="button" data-toggle="collapse" data-target="#advancedOptionsToggle" aria-expanded="false" aria-controls="advancedOptionsToggle">
     Show Advanced Options
@@ -123,18 +120,18 @@
         <span class="tooltip-text"><%= help_message_for(:failure_rate) %></span>
       </label>
       <div class="failure-rate-grid">
-        <%= number_input f, :failure_rate_amount,
+        <%= number_input(f, :failure_rate_amount,
           class: "form-control form-control-sm",
           id: "failure_rate_amount"
-        %>
+        ) %>
         <span class="help-text">devices per</span>
-        <%= number_input f, :failure_rate_seconds,
+        <%= number_input(f, :failure_rate_seconds,
           class: "form-control form-control-sm",
           id: "failure_rate_input"
-        %>
+        ) %>
         <span class="help-text">sec</span>
       </div>
-      <div class="has-error invalid-tooltip"><%= error_tag f, :failure_rate_seconds %></div>
+      <div class="has-error invalid-tooltip"><%= error_tag(f, :failure_rate_seconds) %></div>
     </div>
 
     <div class="form-group">
@@ -143,11 +140,11 @@
         <span class="tooltip-info"></span>
         <span class="tooltip-text"><%= help_message_for(:failure_threshold) %></span>
       </label>
-      <%= number_input f, :failure_threshold,
+      <%= number_input(f, :failure_threshold,
         class: "form-control",
         id: "failure_threshold"
-      %>
-      <div class="has-error"><%= error_tag f, :failure_threshold %></div>
+      ) %>
+      <div class="has-error"><%= error_tag(f, :failure_threshold) %></div>
     </div>
 
     <div class="form-group">
@@ -157,18 +154,18 @@
         <span class="tooltip-text"><%= help_message_for(:device_failure_rate) %></span>
       </label>
       <div class="failure-rate-grid">
-        <%= number_input f, :device_failure_rate_amount,
+        <%= number_input(f, :device_failure_rate_amount,
           class: "form-control form-control-sm",
           id: "device_failure_rate_amount"
-        %>
+        ) %>
         <span class="help-text">failures per</span>
-        <%= number_input f, :device_failure_rate_seconds,
+        <%= number_input(f, :device_failure_rate_seconds,
           class: "form-control form-control-sm",
           id: "device_failure_rate_input"
-        %>
+        ) %>
         <span class="help-text">sec</span>
       </div>
-      <div class="has-error"><%= error_tag f, :device_failure_rate_seconds %></div>
+      <div class="has-error"><%= error_tag(f, :device_failure_rate_seconds) %></div>
     </div>
 
     <div class="form-group">
@@ -177,11 +174,11 @@
         <span class="tooltip-info"></span>
         <span class="tooltip-text"><%= help_message_for(:device_failure_threshold) %></span>
       </label>
-      <%= number_input f, :device_failure_threshold,
+      <%= number_input(f, :device_failure_threshold,
         class: "form-control",
         id: "device_failure_threshold"
-      %>
-      <div class="has-error"><%= error_tag f, :device_failure_threshold %></div>
+      ) %>
+      <div class="has-error"><%= error_tag(f, :device_failure_threshold) %></div>
     </div>
 
     <div class="form-group">
@@ -190,11 +187,11 @@
         <span class="tooltip-info"></span>
         <span class="tooltip-text"><%= help_message_for(:penalty_timeout_minutes) %></span>
       </label>
-      <%= number_input f, :penalty_timeout_minutes,
+      <%= number_input(f, :penalty_timeout_minutes,
         class: "form-control",
         id: "penalty_timeout_minutes"
-      %>
-      <div class="has-error"><%= error_tag f, :penalty_timeout_minutes %></div>
+      ) %>
+      <div class="has-error"><%= error_tag(f, :penalty_timeout_minutes) %></div>
     </div>
   </div>
 
@@ -204,14 +201,14 @@
       <span class="tooltip-info"></span>
       <span class="tooltip-text">Run this code when the device first connects to the console.</span>
     </label>
-    <%= textarea f, :connecting_code, rows: 6, class: "form-control", id: "connecting_code" %>
+    <%= textarea(f, :connecting_code, rows: 6, class: "form-control", id: "connecting_code") %>
     <small class="form-text text-muted mt-1">
       Make sure this is valid Elixir and will not crash the device. This will run before device specific first connect code.
     </small>
-    <div class="has-error"><%= error_tag f, :connecting_code %></div>
+    <div class="has-error"><%= error_tag(f, :connecting_code) %></div>
   </div>
 
   <div class="button-submit-wrapper">
-    <%= submit "Save Changes", class: "btn btn-primary" %>
+    <%= submit("Save Changes", class: "btn btn-primary") %>
   </div>
 <% end %>
diff --git a/lib/nerves_hub_web/templates/deployment/index.html.heex b/lib/nerves_hub_web/templates/deployment/index.html.heex
index 6bbb75ef9..1ff768546 100644
--- a/lib/nerves_hub_web/templates/deployment/index.html.heex
+++ b/lib/nerves_hub_web/templates/deployment/index.html.heex
@@ -48,10 +48,10 @@
           <td>
             <div class="mobile-label help-text">Firmware version</div>
             <div>
-                <%= link(to: Routes.firmware_path(@conn, :show, @org.name, @product.name, deployment.firmware.uuid)) do %>
-              <span class="badge ff-m">
-                <%= firmware_simple_display_name(deployment.firmware) %>
-              </span>
+              <%= link(to: Routes.firmware_path(@conn, :show, @org.name, @product.name, deployment.firmware.uuid)) do %>
+                <span class="badge ff-m">
+                  <%= firmware_simple_display_name(deployment.firmware) %>
+                </span>
               <% end %>
             </div>
           </td>
@@ -81,9 +81,9 @@
                 <img src="/images/icons/more.svg" alt="options" />
               </a>
               <div class="dropdown-menu dropdown-menu-right">
-                <%= link "details", class: "dropdown-item", to: Routes.deployment_path(@conn, :show, @org.name, @product.name, deployment.name) %>
+                <%= link("details", class: "dropdown-item", to: Routes.deployment_path(@conn, :show, @org.name, @product.name, deployment.name)) %>
                 <div class="dropdown-divider"></div>
-                <%= link "edit", class: "dropdown-item", to: Routes.deployment_path(@conn, :edit, @org.name, @product.name, deployment.name) %>
+                <%= link("edit", class: "dropdown-item", to: Routes.deployment_path(@conn, :edit, @org.name, @product.name, deployment.name)) %>
                 <div class="dropdown-divider"></div>
                 <a class="dropdown-item" aria-label="Download Audit Logs" href={Routes.deployment_path(@conn, :export_audit_logs, @org.name, @product.name, deployment.name)}>
                   <div class="button-icon download"></div>
diff --git a/lib/nerves_hub_web/templates/deployment/new-platform.html.heex b/lib/nerves_hub_web/templates/deployment/new-platform.html.heex
index 9265eb37d..7de3350bf 100644
--- a/lib/nerves_hub_web/templates/deployment/new-platform.html.heex
+++ b/lib/nerves_hub_web/templates/deployment/new-platform.html.heex
@@ -7,11 +7,11 @@
       <span class="tooltip-info"></span>
       <span class="tooltip-text">Only allow this platform to be chosen when selecting firmware.</span>
     </label>
-    <%= select f, :platform, @platforms, required: true, id: "platform", class: "form-control" %>
+    <%= select(f, :platform, @platforms, required: true, id: "platform", class: "form-control") %>
   </div>
 
   <div class="button-submit-wrapper">
     <a class="btn btn-secondary" href={Routes.deployment_path(@conn, :index, @org.name, @product.name)}>Cancel</a>
-    <%= submit "Next", class: "btn btn-primary" %>
+    <%= submit("Next", class: "btn btn-primary") %>
   </div>
 <% end %>
diff --git a/lib/nerves_hub_web/templates/deployment/new.html.heex b/lib/nerves_hub_web/templates/deployment/new.html.heex
index 89c47349e..471011a78 100644
--- a/lib/nerves_hub_web/templates/deployment/new.html.heex
+++ b/lib/nerves_hub_web/templates/deployment/new.html.heex
@@ -3,21 +3,21 @@
 <%= form_for @changeset, Routes.deployment_path(@conn, :create, @org.name, @product.name), [as: :deployment], fn f -> %>
   <div class="form-group">
     <label for="name_input">Deployment name</label>
-    <%= text_input f, :name, class: "form-control", id: "name_input" %>
-    <div class="has-error"><%= error_tag f, :name %></div>
+    <%= text_input(f, :name, class: "form-control", id: "name_input") %>
+    <div class="has-error"><%= error_tag(f, :name) %></div>
   </div>
 
   <div class="form-group">
     <label for="tags_input">Tag(s) distributed to</label>
-    <%= text_input f, :tags,
-        class: "form-control",
-        id: "tags_input",
-        value:
-          @changeset
-          |> Ecto.Changeset.get_change(:conditions, %{})
-          |> Map.get("tags", "")
-      %>
-    <div class="has-error"><%= error_tag f, :tags %></div>
+    <%= text_input(f, :tags,
+      class: "form-control",
+      id: "tags_input",
+      value:
+        @changeset
+        |> Ecto.Changeset.get_change(:conditions, %{})
+        |> Map.get("tags", "")
+    ) %>
+    <div class="has-error"><%= error_tag(f, :tags) %></div>
   </div>
 
   <div class="form-group">
@@ -26,26 +26,26 @@
       <span class="tooltip-info"></span>
       <span class="tooltip-text">Once selected, deployments will use the same platform and architecture going forward.</span>
     </label>
-    <%= select f, :firmware_id, firmware_dropdown_options(@firmwares), required: true, id: "firmware_id", class: "form-control" %>
+    <%= select(f, :firmware_id, firmware_dropdown_options(@firmwares), required: true, id: "firmware_id", class: "form-control") %>
     <div class="select-icon"></div>
-    <div class="has-error"><%= error_tag f, :firmware_id %></div>
+    <div class="has-error"><%= error_tag(f, :firmware_id) %></div>
   </div>
 
   <div class="form-group">
     <label for="version_input">Version requirement</label>
-    <%= text_input f, :version,
+    <%= text_input(f, :version,
       class: "form-control",
       id: "version_input",
       value:
         @changeset
         |> Ecto.Changeset.get_change(:conditions, %{})
         |> Map.get("version", "")
-    %>
-    <div class="has-error"><%= error_tag f, :version %></div>
+    ) %>
+    <div class="has-error"><%= error_tag(f, :version) %></div>
   </div>
 
   <div class="button-submit-wrapper">
     <a class="btn btn-secondary" href={Routes.deployment_path(@conn, :new, @org.name, @product.name)}>Back</a>
-    <%= submit "Create Deployment", class: "btn btn-primary" %>
+    <%= submit("Create Deployment", class: "btn btn-primary") %>
   </div>
 <% end %>
diff --git a/lib/nerves_hub_web/templates/deployment/show.html.heex b/lib/nerves_hub_web/templates/deployment/show.html.heex
index 8dcad35f1..cc308ced6 100644
--- a/lib/nerves_hub_web/templates/deployment/show.html.heex
+++ b/lib/nerves_hub_web/templates/deployment/show.html.heex
@@ -1,5 +1,5 @@
 <div class="action-row">
-  <%= link "All Deployments", to: Routes.deployment_path(@conn, :index, @org.name, @product.name), class: "back-link"%>
+  <%= link("All Deployments", to: Routes.deployment_path(@conn, :index, @org.name, @product.name), class: "back-link") %>
   <div class="btn-group" role="group" aria-label="Deployment Actions">
     <%= link(to: Routes.deployment_path(@conn, :toggle, @org.name, @product.name, @deployment.name), class: "btn btn-outline-light btn-action", method: :post, aria: [label: "Turn #{opposite_status(@deployment)} deployment"]) do %>
       <span class="button-icon power"></span>
@@ -53,7 +53,7 @@
         <% end %>
         <div>
           <div class="help-text mb-1">Firmware version</div>
-          <span> <a href={Routes.firmware_path(@conn, :show, @org.name, @product.name, @firmware.uuid)} class="badge ff-m"><%= firmware_summary(@firmware) %></a> </span>
+          <span><a href={Routes.firmware_path(@conn, :show, @org.name, @product.name, @firmware.uuid)} class="badge ff-m"><%= firmware_summary(@firmware) %></a></span>
         </div>
         <div>
           <div class="help-text mb-1">Version requirement</div>
diff --git a/lib/nerves_hub_web/templates/device/_header.html.heex b/lib/nerves_hub_web/templates/device/_header.html.heex
index a83804518..6eefbc571 100644
--- a/lib/nerves_hub_web/templates/device/_header.html.heex
+++ b/lib/nerves_hub_web/templates/device/_header.html.heex
@@ -50,12 +50,12 @@
         <% @device.updates_enabled == false -> %>
           <span>Disabled</span>
           <span class="ml-1">
-            <img src="/images/icons/firmware-disabled.svg" alt="Firmware blocked icon" style="width: 1.3rem; margin-top: -4px;"/>
+            <img src="/images/icons/firmware-disabled.svg" alt="Firmware blocked icon" style="width: 1.3rem; margin-top: -4px;" />
           </span>
         <% Devices.device_in_penalty_box?(@device) -> %>
           <span>In Penalty Box</span>
           <span class="ml-1">
-            <img src="/images/icons/firmware-penalty-box.svg" alt="Firmware penalty box icon" style="width: 1.3rem; margin-top: -4px;"/>
+            <img src="/images/icons/firmware-penalty-box.svg" alt="Firmware penalty box icon" style="width: 1.3rem; margin-top: -4px;" />
           </span>
           <a style="" class="btn btn-sm btn-outline-light btn-action" href="#" class="" title="Clear penalty box" aria-label="Clear penalty box" type="button" phx-click="clear-penalty-box">
             Clear
@@ -63,7 +63,7 @@
         <% true -> %>
           <span>Enabled</span>
           <span class="ml-1">
-            <img src="/images/icons/firmware-enabled.svg" alt="Firmware enabled icon" style="width: 1.3rem; margin-top: -4px;"/>
+            <img src="/images/icons/firmware-enabled.svg" alt="Firmware enabled icon" style="width: 1.3rem; margin-top: -4px;" />
           </span>
       <% end %>
     </p>
diff --git a/lib/nerves_hub_web/templates/device/edit.html.heex b/lib/nerves_hub_web/templates/device/edit.html.heex
index d7ad14a50..13b71eafe 100644
--- a/lib/nerves_hub_web/templates/device/edit.html.heex
+++ b/lib/nerves_hub_web/templates/device/edit.html.heex
@@ -1,4 +1,4 @@
-<%= link "Back to Device", to: Routes.device_path(@conn, :show, @org.name, @product.name, @device.identifier), class: "back-link"%>
+<%= link("Back to Device", to: Routes.device_path(@conn, :show, @org.name, @product.name, @device.identifier), class: "back-link") %>
 <h1>Edit Device</h1>
 
 <%= form_for @changeset, Routes.device_path(@conn, :update, @org.name, @product.name, @device.identifier), [method: :patch], fn f -> %>
@@ -8,8 +8,8 @@
       <span class="tooltip-info"></span>
       <span class="tooltip-text">Device ID cannot be changed once created</span>
     </label>
-    <%= text_input f, :identifier, class: "form-control", id: "identifier_input", disabled: "true" %>
-    <div class="has-error"><%= error_tag f, :identifier %></div>
+    <%= text_input(f, :identifier, class: "form-control", id: "identifier_input", disabled: "true") %>
+    <div class="has-error"><%= error_tag(f, :identifier) %></div>
   </div>
 
   <div class="form-group">
@@ -18,8 +18,8 @@
       <span class="tooltip-info"></span>
       <span class="tooltip-text">Description for this device</span>
     </label>
-    <%= text_input f, :description, class: "form-control", id: "description_input" %>
-    <div class="has-error"><%= error_tag f, :description %></div>
+    <%= text_input(f, :description, class: "form-control", id: "description_input") %>
+    <div class="has-error"><%= error_tag(f, :description) %></div>
   </div>
 
   <div class="form-group">
@@ -28,11 +28,11 @@
       <span class="tooltip-info"></span>
       <span class="tooltip-text">Use tags to manage firmware deployments for different sets of devices.</span>
     </label>
-    <%= text_input f, :tags, class: "form-control", id: "tags", value: tags_to_string(@changeset) %>
+    <%= text_input(f, :tags, class: "form-control", id: "tags", value: tags_to_string(@changeset)) %>
     <small class="form-text text-muted mt-1">
       Every device is added to the 'all' tag by default. You can have multiple tags separated by commas.
     </small>
-    <div class="has-error"><%= error_tag f, :tags %></div>
+    <div class="has-error"><%= error_tag(f, :tags) %></div>
   </div>
 
   <div class="form-group">
@@ -41,14 +41,14 @@
       <span class="tooltip-info"></span>
       <span class="tooltip-text">Run this code when the device first connects to the console.</span>
     </label>
-    <%= textarea f, :connecting_code, rows: 6, class: "form-control", id: "connecting_code" %>
+    <%= textarea(f, :connecting_code, rows: 6, class: "form-control", id: "connecting_code") %>
     <small class="form-text text-muted mt-1">
       Make sure this is valid Elixir and will not crash the device.
     </small>
-    <div class="has-error"><%= error_tag f, :connecting_code %></div>
+    <div class="has-error"><%= error_tag(f, :connecting_code) %></div>
   </div>
 
   <div class="button-submit-wrapper">
-    <%= submit "Save Changes", class: "btn btn-primary" %>
+    <%= submit("Save Changes", class: "btn btn-primary") %>
   </div>
 <% end %>
diff --git a/lib/nerves_hub_web/templates/device/index.html.heex b/lib/nerves_hub_web/templates/device/index.html.heex
index ae9987c2e..9a0b451d8 100644
--- a/lib/nerves_hub_web/templates/device/index.html.heex
+++ b/lib/nerves_hub_web/templates/device/index.html.heex
@@ -2,13 +2,20 @@
   <div class="no-results-blowup-wrapper">
     <img src="/images/device.svg" alt="No devices" />
     <h3 style="margin-top: 2.75rem"><%= @product.name %> doesn’t have any devices yet</h3>
-    <p class="mt-3">Or follow <a class="strong inline" target="_blank" rel="noopener noreferrer" href="https://docs.nerves-hub.org/nerves-hub/setup/devices">these steps</a> to add a device using the terminal.</p>
+    <p class="mt-3">
+      Or follow <a class="strong inline" target="_blank" rel="noopener noreferrer" href="https://docs.nerves-hub.org/nerves-hub/setup/devices">these steps</a> to add a device using the terminal.
+    </p>
   </div>
 <% else %>
   <div class="action-row">
     <div class="flex-row align-items-center">
       <h1 class="mr-3 mb-0">Devices</h1>
-      <button class={"btn btn-outline-light btn-action #{if @show_filters, do: "btn-filter-hide", else: "btn-filter-show"}"} type="button" phx-click="toggle-filters" phx-value-toggle={to_string(@show_filters)}>
+      <button
+        class={"btn btn-outline-light btn-action #{if @show_filters, do: "btn-filter-hide", else: "btn-filter-show"}"}
+        type="button"
+        phx-click="toggle-filters"
+        phx-value-toggle={to_string(@show_filters)}
+      >
         <span class="action-text">
           <%= if @show_filters, do: "Hide Filters", else: "Show Filters" %>
         </span>
@@ -33,7 +40,7 @@
       </button>
     <% end %>
   </div>
-  <%= if @show_filters do%>
+  <%= if @show_filters do %>
     <div class="filter-wrapper">
       <h4 class="color-white mb-2">Filters</h4>
       <form id="filter-form" phx-change="update-filters" class="filter-form device-filters">
@@ -136,7 +143,9 @@
               <div class="select-icon"></div>
             </div>
 
-            <button class="btn btn-outline-light btn-action btn-primary ml-1" type="submit" data-confirm={move_alert(@target_product)} {unless @target_product, do: [disabled: true], else: []}>Move</button>
+            <button class="btn btn-outline-light btn-action btn-primary ml-1" type="submit" data-confirm={move_alert(@target_product)} {unless @target_product, do: [disabled: true], else: []}>
+              Move
+            </button>
           </div>
         </form>
 
@@ -146,7 +155,14 @@
             <div class="flex-grow">
               <input type="text" name="tags" id="input_tags" class="form-control" value={@current_filters["tag"]} phx-debounce="500" />
             </div>
-            <button class="btn btn-outline-light btn-action btn-primary ml-1" type="submit" data-confirm="This will update tags on all selected devices" {if @valid_tags && @device_tags != "", do: [], else: [disabled: true]}>Set</button>
+            <button
+              class="btn btn-outline-light btn-action btn-primary ml-1"
+              type="submit"
+              data-confirm="This will update tags on all selected devices"
+              {if @valid_tags && @device_tags != "", do: [], else: [disabled: true]}
+            >
+              Set
+            </button>
           </div>
           <div class={if @valid_tags, do: "hidden"}><span class="has-error"> Tags Cannot Contain Spaces </span></div>
         </form>
@@ -198,7 +214,7 @@
     <%= for device <- @devices do %>
       <tr class="item">
         <td>
-          <input class="checkbox" {if device.id in @selected_devices, do: [checked: true], else: []} type="checkbox" id={"#{device.id}-select"} phx-value-id={device.id} phx-click="select">
+          <input class="checkbox" {if device.id in @selected_devices, do: [checked: true], else: []} type="checkbox" id={"#{device.id}-select"} phx-value-id={device.id} phx-click="select" />
         </td>
         <td>
           <div class="mobile-label help-text">Identifier</div>
@@ -267,13 +283,13 @@
               <img src="/images/icons/more.svg" alt="options" />
             </a>
             <div class="dropdown-menu dropdown-menu-right">
-              <%= link "details", class: "dropdown-item", to: Routes.device_path(@socket, :show, @org.name, @product.name, device.identifier) %>
+              <%= link("details", class: "dropdown-item", to: Routes.device_path(@socket, :show, @org.name, @product.name, device.identifier)) %>
               <div class="dropdown-divider"></div>
-              <%= link "Reboot", to: Routes.device_path(@socket, :reboot, @org.name, @product.name, device.identifier), method: :post, class: "dropdown-item"  %>
+              <%= link("Reboot", to: Routes.device_path(@socket, :reboot, @org.name, @product.name, device.identifier), method: :post, class: "dropdown-item") %>
               <div class="dropdown-divider"></div>
-              <%= link "Console", to: Routes.device_path(@socket, :console, @org.name, @product.name, device.identifier), class: "dropdown-item" %>
+              <%= link("Console", to: Routes.device_path(@socket, :console, @org.name, @product.name, device.identifier), class: "dropdown-item") %>
               <div class="dropdown-divider"></div>
-              <%= link "Edit", class: "dropdown-item", to: Routes.device_path(@socket, :edit, @org.name, @product.name, device.identifier) %>
+              <%= link("Edit", class: "dropdown-item", to: Routes.device_path(@socket, :edit, @org.name, @product.name, device.identifier)) %>
               <div class="dropdown-divider"></div>
               <%= link to: Routes.device_path(@socket, :toggle_updates, @org.name, @product.name, device.identifier), method: :post, class: "dropdown-item" do %>
                 <span>
diff --git a/lib/nerves_hub_web/templates/device/new.html.heex b/lib/nerves_hub_web/templates/device/new.html.heex
index 66511887b..d7858f0c4 100644
--- a/lib/nerves_hub_web/templates/device/new.html.heex
+++ b/lib/nerves_hub_web/templates/device/new.html.heex
@@ -7,8 +7,8 @@
       <span class="tooltip-info"></span>
       <span class="tooltip-text">Device ID cannot be changed once created</span>
     </label>
-    <%= text_input f, :identifier, class: "form-control", id: "identifier_input" %>
-    <div class="has-error"><%= error_tag f, :identifier %></div>
+    <%= text_input(f, :identifier, class: "form-control", id: "identifier_input") %>
+    <div class="has-error"><%= error_tag(f, :identifier) %></div>
   </div>
 
   <div class="form-group">
@@ -17,8 +17,8 @@
       <span class="tooltip-info"></span>
       <span class="tooltip-text">Description for this device</span>
     </label>
-    <%= text_input f, :description, class: "form-control", id: "description_input" %>
-    <div class="has-error"><%= error_tag f, :description %></div>
+    <%= text_input(f, :description, class: "form-control", id: "description_input") %>
+    <div class="has-error"><%= error_tag(f, :description) %></div>
   </div>
 
   <div class="form-group" aria-hidden="true">
@@ -27,11 +27,11 @@
       <span class="tooltip-info"></span>
       <span class="tooltip-text">Tags are used by deployments to target a device. A device must have matching tag(s) for the deployment to update it</span>
     </label>
-    <%= text_input f, :tags, class: "form-control", id: "tag_input" %>
-    <div class="has-error"><%= error_tag f, :tags %></div>
+    <%= text_input(f, :tags, class: "form-control", id: "tag_input") %>
+    <div class="has-error"><%= error_tag(f, :tags) %></div>
   </div>
 
   <div class="button-submit-wrapper">
-    <%= submit "Add Device", class: "btn btn-primary" %>
+    <%= submit("Add Device", class: "btn btn-primary") %>
   </div>
 <% end %>
diff --git a/lib/nerves_hub_web/templates/device/show.html.heex b/lib/nerves_hub_web/templates/device/show.html.heex
index 8f208185b..b7ebd7836 100644
--- a/lib/nerves_hub_web/templates/device/show.html.heex
+++ b/lib/nerves_hub_web/templates/device/show.html.heex
@@ -14,10 +14,10 @@
 <% end %>
 
 <div class="action-row">
-  <%= link "All Devices", to: Routes.device_path(@socket, :index, @org.name, @product.name), class: "back-link"%>
+  <%= link("All Devices", to: Routes.device_path(@socket, :index, @org.name, @product.name), class: "back-link") %>
   <div class="btn-group" role="group" aria-label="Device Actions">
     <%= if @device.deleted_at do %>
-      <button class="btn btn-outline-light btn-action"  aria-label="Restore" type="button" phx-click="restore">
+      <button class="btn btn-outline-light btn-action" aria-label="Restore" type="button" phx-click="restore">
         <span class="button-icon power"></span>
         <span class="action-text">Restore</span>
       </button>
@@ -26,15 +26,15 @@
         <span class="action-text">Destroy</span>
       </button>
     <% else %>
-      <button class="btn btn-outline-light btn-action"  aria-label="Reboot device" type="button" phx-click="reboot" data-confirm="Are you sure?">
+      <button class="btn btn-outline-light btn-action" aria-label="Reboot device" type="button" phx-click="reboot" data-confirm="Are you sure?">
         <span class="button-icon power"></span>
         <span class="action-text">Reboot</span>
       </button>
-      <button class="btn btn-outline-light btn-action"  aria-label="Reconnect device" type="button" phx-click="reconnect">
+      <button class="btn btn-outline-light btn-action" aria-label="Reconnect device" type="button" phx-click="reconnect">
         <span class="button-icon power"></span>
         <span class="action-text">Reconnect</span>
       </button>
-      <button class="btn btn-outline-light btn-action"  aria-label="Identify device" type="button" phx-click="identify">
+      <button class="btn btn-outline-light btn-action" aria-label="Identify device" type="button" phx-click="identify">
         <span class="button-icon identify"></span>
         <span class="action-text">Identify</span>
       </button>
@@ -133,7 +133,12 @@
   <div class="device-header-group">
     <h3 class="mb-2">Latest Activity</h3>
 
-    <a class="btn btn-outline-light btn-action" title="Download Audit Logs" aria-label="Download Audit Logs" href={Routes.device_path(@socket, :export_audit_logs, @org.name, @product.name, @device.identifier)}>
+    <a
+      class="btn btn-outline-light btn-action"
+      title="Download Audit Logs"
+      aria-label="Download Audit Logs"
+      href={Routes.device_path(@socket, :export_audit_logs, @org.name, @product.name, @device.identifier)}
+    >
       <div class="button-icon download"></div>
     </a>
   </div>
@@ -177,17 +182,17 @@
       <.live_file_input upload={@uploads.certificate} class="upload-select" />
     </div>
   </form>
-  <br/>
+  <br />
 </div>
 
 <%= if Enum.any?(@device.device_certificates, & &1.org_id != @device.org_id) do %>
   <div class="alert alert-warning">
     <div class="content-container">
       <center>Device was previously moved and has certificates associated with a Signer CA from another organization</center>
-      <br/>
+      <br />
       <center>In most cases, this should be okay (or was even intentional), but automatic device certificate creation</center>
       <center>will not work until the Signer CA is also moved the the same organization as this device.</center>
-      <br/>
+      <br />
       <center>If the intention is leave the Signer CA in the other organization, then this will continue to work</center>
       <center>so long as certificates are managed manually for this device and other metadata, such as the product</center>
       <center>and firmware signing keys appropiately match the existing firmware as well</center>
@@ -240,7 +245,11 @@
                 <%= link("Organization", class: "dropdown-item", aria_label: "Originating Organization", to: Routes.product_path(@socket, :index, Repo.preload(cert, :org).org.name)) %>
               <% end %>
               <%= if cert.der do %>
-                <%= link("Download", class: "dropdown-item", aria_label: "Download Device Certificate", to: Routes.device_path(@socket, :download_certificate, @org.name, @product.name, @device.identifier, cert.serial)) %>
+                <%= link("Download",
+                  class: "dropdown-item",
+                  aria_label: "Download Device Certificate",
+                  to: Routes.device_path(@socket, :download_certificate, @org.name, @product.name, @device.identifier, cert.serial)
+                ) %>
               <% end %>
               <a class="dropdown-item" phx-click="delete-certificate" phx-value-serial={cert.serial} data-confirm={"Delete #{format_serial(cert.serial)}?"}>Delete</a>
             </div>
diff --git a/lib/nerves_hub_web/templates/error/404.html.heex b/lib/nerves_hub_web/templates/error/404.html.heex
index 256f10bfd..48672b421 100644
--- a/lib/nerves_hub_web/templates/error/404.html.heex
+++ b/lib/nerves_hub_web/templates/error/404.html.heex
@@ -1,61 +1,58 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="description" content="">
-    <meta name="author" content="">
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="description" content="" />
+    <meta name="author" content="" />
 
     <title>Page not found · NervesHub</title>
-    <link rel="stylesheet" href={Routes.static_path(NervesHubWeb.Endpoint, "/css/app.css")}>
+    <link rel="stylesheet" href={Routes.static_path(NervesHubWeb.Endpoint, "/css/app.css")} />
   </head>
 
-<nav class="navbar navbar-expand navbar-dark fixed-top flex-md-nowrap p-0 flex-row justify-content-center">
-  <div class="content-container flex-row align-items-center justify-content-between h-100">
-    <a class="logo" href="/">
-      <img src="/images/logo.svg" alt="logo" />
-      <img src="/images/logo-no-text.svg" alt="logo" class="mobile-logo" />
-    </a>
-  </div>
-</nav>
+  <nav class="navbar navbar-expand navbar-dark fixed-top flex-md-nowrap p-0 flex-row justify-content-center">
+    <div class="content-container flex-row align-items-center justify-content-between h-100">
+      <a class="logo" href="/">
+        <img src="/images/logo.svg" alt="logo" />
+        <img src="/images/logo-no-text.svg" alt="logo" class="mobile-logo" />
+      </a>
+    </div>
+  </nav>
 
-<body>
-  <div class="normal-wrapper">
-    <main role="main" class="flex-column content-container">
-    <div class="no-results-blowup-wrapper">
-      <img src="/images/product.svg" alt="No products">
-        <br>
-        Sorry, the page you are looking for does not exist.
+  <body>
+    <div class="normal-wrapper">
+      <main role="main" class="flex-column content-container">
+        <div class="no-results-blowup-wrapper">
+          <img src="/images/product.svg" alt="No products" />
+          <br /> Sorry, the page you are looking for does not exist.
         </div>
-    </main>
-  </div>
-</body>
-
+      </main>
+    </div>
+  </body>
 
-<footer class="footer">
-  <div class="grid josh-js" data-josh-anim-name="fadeIn">
-    <img src="/images/logo.svg" alt="NervesHub Logo" class="footer-logo" />
-    <div class="footer-nav resources">
-      <h6>Resources</h6>
-      <a href="https://docs.nerves-hub.org/" target="_blank" rel="noopener noreferrer">Documentation</a>
-      <a href="https://github.com/nerves-hub" target="_blank" rel="noopener noreferrer">Source code</a>
-      <a href="https://hexdocs.pm/nerves_hub/readme.html#content" target="_blank" rel="noopener noreferrer">HexDocs</a>
-      <a href={Routes.nerves_key_path(NervesHubWeb.Endpoint, :index)}>NervesKey</a>
-      <a href="https://status.nerves-hub.org/" target="_blank" rel="noopener noreferrer">Status</a>
+  <footer class="footer">
+    <div class="grid josh-js" data-josh-anim-name="fadeIn">
+      <img src="/images/logo.svg" alt="NervesHub Logo" class="footer-logo" />
+      <div class="footer-nav resources">
+        <h6>Resources</h6>
+        <a href="https://docs.nerves-hub.org/" target="_blank" rel="noopener noreferrer">Documentation</a>
+        <a href="https://github.com/nerves-hub" target="_blank" rel="noopener noreferrer">Source code</a>
+        <a href="https://hexdocs.pm/nerves_hub/readme.html#content" target="_blank" rel="noopener noreferrer">HexDocs</a>
+        <a href={Routes.nerves_key_path(NervesHubWeb.Endpoint, :index)}>NervesKey</a>
+        <a href="https://status.nerves-hub.org/" target="_blank" rel="noopener noreferrer">Status</a>
+      </div>
+      <div class="footer-nav help">
+        <h6>Help</h6>
+        <a href="https://github.com/smartrent/nerves_hub_web/issues" target="_blank" rel="noopener noreferrer">Report an issue</a>
+        <a href="mailto:support@nerves-hub.org" target="_blank" rel="noopener noreferrer">Contact support</a>
+      </div>
     </div>
-    <div class="footer-nav help">
-      <h6>Help</h6>
-      <a href="https://github.com/smartrent/nerves_hub_web/issues" target="_blank" rel="noopener noreferrer">Report an issue</a>
-      <a href="mailto:support@nerves-hub.org" target="_blank" rel="noopener noreferrer">Contact support</a>
+    <div class="tos-grid">
+      <div></div>
+      <div><a href={Routes.policy_path(NervesHubWeb.Endpoint, :coc)}>Code of Conduct</a></div>
+      <div><a href={Routes.policy_path(NervesHubWeb.Endpoint, :tos)}>Terms of Service</a></div>
+      <div><a href={Routes.policy_path(NervesHubWeb.Endpoint, :privacy)}>Privacy Policy</a></div>
     </div>
-  </div>
-  <div class="tos-grid">
-    <div></div>
-    <div><a href={Routes.policy_path(NervesHubWeb.Endpoint, :coc)}>Code of Conduct</a></div>
-    <div><a href={Routes.policy_path(NervesHubWeb.Endpoint, :tos)}>Terms of Service</a></div>
-    <div><a href={Routes.policy_path(NervesHubWeb.Endpoint, :privacy)}>Privacy Policy</a></div>
-  </div>
-
-</footer>
+  </footer>
 </html>
diff --git a/lib/nerves_hub_web/templates/firmware/index.html.heex b/lib/nerves_hub_web/templates/firmware/index.html.heex
index 52f266715..ed1df667a 100644
--- a/lib/nerves_hub_web/templates/firmware/index.html.heex
+++ b/lib/nerves_hub_web/templates/firmware/index.html.heex
@@ -76,7 +76,12 @@
             <div class="dropdown-menu dropdown-menu-right">
               <%= link("Download", class: "dropdown-item", to: Routes.firmware_path(@conn, :download, @org.name, @product.name, firmware.uuid)) %>
               <div class="dropdown-divider"></div>
-              <%= link "Delete", class: "dropdown-item", to: Routes.firmware_path(@conn, :delete, @org.name, @product.name, firmware.uuid), method: :delete, data: [confirm: "Are you sure you want to delete this firmware? This can not be undone."] %>
+              <%= link("Delete",
+                class: "dropdown-item",
+                to: Routes.firmware_path(@conn, :delete, @org.name, @product.name, firmware.uuid),
+                method: :delete,
+                data: [confirm: "Are you sure you want to delete this firmware? This can not be undone."]
+              ) %>
             </div>
           </div>
         </td>
diff --git a/lib/nerves_hub_web/templates/firmware/show.html.heex b/lib/nerves_hub_web/templates/firmware/show.html.heex
index dd06878fe..08fd56304 100644
--- a/lib/nerves_hub_web/templates/firmware/show.html.heex
+++ b/lib/nerves_hub_web/templates/firmware/show.html.heex
@@ -1,5 +1,5 @@
 <div class="action-row">
-  <%= link "All Firmware", to: Routes.firmware_path(@conn, :index, @org.name, @product.name), class: "back-link"%>
+  <%= link("All Firmware", to: Routes.firmware_path(@conn, :index, @org.name, @product.name), class: "back-link") %>
   <div class="btn-group" role="group" aria-label="Device Actions">
     <%= link(
       class: "btn btn-outline-light btn-action",
diff --git a/lib/nerves_hub_web/templates/firmware/upload.html.heex b/lib/nerves_hub_web/templates/firmware/upload.html.heex
index 0c45259d9..9b90b09bc 100644
--- a/lib/nerves_hub_web/templates/firmware/upload.html.heex
+++ b/lib/nerves_hub_web/templates/firmware/upload.html.heex
@@ -4,10 +4,10 @@
 <%= form_for @changeset, Routes.firmware_path(@conn, :do_upload, @org.name, @product.name), [multipart: true], fn f -> %>
   <div class="form-group custom-upload-group">
     <label for="file_input" class="custom-upload-label not-selected">Click to upload file</label>
-    <%= file_input f, :file, required: true, id: "file_input", class: "custom-upload-input hidden" %>
-    <div class="has-error"><%= error_tag f, :file %></div>
+    <%= file_input(f, :file, required: true, id: "file_input", class: "custom-upload-input hidden") %>
+    <div class="has-error"><%= error_tag(f, :file) %></div>
   </div>
   <div class="button-submit-wrapper">
-    <%= submit "Upload Firmware", class: "btn btn-primary" %>
+    <%= submit("Upload Firmware", class: "btn btn-primary") %>
   </div>
 <% end %>
diff --git a/lib/nerves_hub_web/templates/layout/_footer.html.heex b/lib/nerves_hub_web/templates/layout/_footer.html.heex
index 40374fe6c..71543281b 100644
--- a/lib/nerves_hub_web/templates/layout/_footer.html.heex
+++ b/lib/nerves_hub_web/templates/layout/_footer.html.heex
@@ -17,5 +17,4 @@
     <div><a href={Routes.policy_path(@conn, :tos)}>Terms of Service</a></div>
     <div><a href={Routes.policy_path(@conn, :privacy)}>Privacy Policy</a></div>
   </div>
-
 </footer>
diff --git a/lib/nerves_hub_web/templates/layout/_navigation.html.heex b/lib/nerves_hub_web/templates/layout/_navigation.html.heex
index f18dccc29..e424197d0 100644
--- a/lib/nerves_hub_web/templates/layout/_navigation.html.heex
+++ b/lib/nerves_hub_web/templates/layout/_navigation.html.heex
@@ -9,7 +9,10 @@
       <ul class="navbar-nav mr-auto flex-grow">
         <li class="nav-item dropdown switcher">
           <a class="nav-link dropdown-toggle org-select arrow-primary" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-            <%= if org = get_in(@conn.assigns, [:org]), do: org.name, else: "Select Org" %><%= if product = product(@conn) do %> <span class="workspace-divider">:</span> <%= product.name %><% end %>
+            <%= if org = get_in(@conn.assigns, [:org]), do: org.name, else: "Select Org" %>
+            <%= if product = product(@conn) do %>
+              <span class="workspace-divider">:</span> <%= product.name %>
+            <% end %>
           </a>
 
           <div class="dropdown-menu workspace-dropdown" aria-labelledby="navbarDropdownMenuLink">
diff --git a/lib/nerves_hub_web/templates/layout/console.html.heex b/lib/nerves_hub_web/templates/layout/console.html.heex
index 8cd6a3611..2e0148843 100644
--- a/lib/nerves_hub_web/templates/layout/console.html.heex
+++ b/lib/nerves_hub_web/templates/layout/console.html.heex
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html lang="en" id="console-html">
   <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="description" content="">
-    <meta name="author" content="">
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="description" content="" />
+    <meta name="author" content="" />
 
     <title><%= @device.identifier %></title>
-    <link rel="stylesheet" href={Routes.static_path(@conn, "/css/app.css")}>
+    <link rel="stylesheet" href={Routes.static_path(@conn, "/css/app.css")} />
   </head>
 
   <body id="console-body">
@@ -18,6 +18,7 @@
       window.userToken = "<%= assigns[:user_token] %>"
     </script>
     <%= csrf_meta_tag() %>
-    <script type="text/javascript" src={Routes.static_path(@conn, "/js/console.js")}></script>
+    <script type="text/javascript" src={Routes.static_path(@conn, "/js/console.js")}>
+    </script>
   </body>
 </html>
diff --git a/lib/nerves_hub_web/templates/layout/root.html.heex b/lib/nerves_hub_web/templates/layout/root.html.heex
index a17ed9f71..943fe4ecd 100644
--- a/lib/nerves_hub_web/templates/layout/root.html.heex
+++ b/lib/nerves_hub_web/templates/layout/root.html.heex
@@ -1,41 +1,46 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="description" content="">
-    <meta name="author" content="">
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="description" content="" />
+    <meta name="author" content="" />
 
     <Phoenix.Component.live_title>
       <%= assigns[:page_title] || "NervesHub" %>
     </Phoenix.Component.live_title>
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.7.2/styles/default.min.css">
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.7.2/highlight.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.7.2/languages/bash.min.js"></script>
-    <script>hljs.highlightAll();</script>
-    <link rel="stylesheet" href={Routes.static_path(@conn, "/css/app.css")}>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.7.2/styles/default.min.css" />
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.7.2/highlight.min.js">
+    </script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/10.7.2/languages/bash.min.js">
+    </script>
+    <script>
+      hljs.highlightAll();
+    </script>
+    <link rel="stylesheet" href={Routes.static_path(@conn, "/css/app.css")} />
 
     <link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/cookieconsent2/3.1.0/cookieconsent.min.css" />
-    <script src="//cdnjs.cloudflare.com/ajax/libs/cookieconsent2/3.1.0/cookieconsent.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/cookieconsent2/3.1.0/cookieconsent.min.js">
+    </script>
     <script>
-    window.addEventListener("load", function(){
-    window.cookieconsent.initialise({
-      "palette": {
-        "popup": {
-          "background": "#343a40"
+      window.addEventListener("load", function(){
+      window.cookieconsent.initialise({
+        "palette": {
+          "popup": {
+            "background": "#343a40"
+          },
+          "button": {
+            "background": "#f1d600"
+          }
         },
-        "button": {
-          "background": "#f1d600"
+        "position": "bottom",
+        "content": {
+          "message": "NervesHub uses cookies to ensure you get the best experience we can provide."
         }
-      },
-      "position": "bottom",
-      "content": {
-        "message": "NervesHub uses cookies to ensure you get the best experience we can provide."
-      }
-    })});
+      })});
     </script>
-    <link href="https://fonts.googleapis.com/css?family=Audiowide" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Audiowide" rel="stylesheet" />
   </head>
 
   <body>
@@ -48,6 +53,7 @@
       window.orgId = "<%= assigns[:org] && Map.get(assigns[:org], :id) %>"
     </script>
     <%= csrf_meta_tag() %>
-    <script type="text/javascript" src={Routes.static_path(@conn, "/js/app.js")}></script>
+    <script type="text/javascript" src={Routes.static_path(@conn, "/js/app.js")}>
+    </script>
   </body>
 </html>
diff --git a/lib/nerves_hub_web/templates/org/edit.html.heex b/lib/nerves_hub_web/templates/org/edit.html.heex
index e5ade7da0..1e027c421 100644
--- a/lib/nerves_hub_web/templates/org/edit.html.heex
+++ b/lib/nerves_hub_web/templates/org/edit.html.heex
@@ -9,8 +9,8 @@
       <span class="tooltip-info"></span>
       <span class="tooltip-text">Must be one word</span>
     </label>
-    <%= text_input f, :name, class: "form-control", id: "name_input" %>
-    <div class="has-error"><%= error_tag f, :name %></div>
+    <%= text_input(f, :name, class: "form-control", id: "name_input") %>
+    <div class="has-error"><%= error_tag(f, :name) %></div>
   </div>
-  <%= submit "Save Changes", class: "btn btn-primary" %>
+  <%= submit("Save Changes", class: "btn btn-primary") %>
 <% end %>
diff --git a/lib/nerves_hub_web/templates/org/form.html.heex b/lib/nerves_hub_web/templates/org/form.html.heex
index c54f8de48..158ec5380 100644
--- a/lib/nerves_hub_web/templates/org/form.html.heex
+++ b/lib/nerves_hub_web/templates/org/form.html.heex
@@ -11,14 +11,13 @@
       <span class="tooltip-info"></span>
       <span class="tooltip-text">Must be one word</span>
     </label>
-    <%= text_input f, :name, class: "form-control", id: "name_input" %>
+    <%= text_input(f, :name, class: "form-control", id: "name_input") %>
     <div class="has-error">
-      <%= error_tag f, :name %>
+      <%= error_tag(f, :name) %>
     </div>
   </div>
 
   <div class="button-submit-wrapper">
-    <%= submit "Create Organization", class: "btn btn-primary" %>
+    <%= submit("Create Organization", class: "btn btn-primary") %>
   </div>
-
 <% end %>
diff --git a/lib/nerves_hub_web/templates/org/invite.html.heex b/lib/nerves_hub_web/templates/org/invite.html.heex
index e73f46581..f9ab62152 100644
--- a/lib/nerves_hub_web/templates/org/invite.html.heex
+++ b/lib/nerves_hub_web/templates/org/invite.html.heex
@@ -7,9 +7,9 @@
 <%= form_for @changeset, Routes.org_path(@conn, :send_invite, @org.name), fn f -> %>
   <div class="form-group mt-6">
     <label for="email_input" class="h3 mb-1">Email</label>
-    <%= email_input f, :email, class: "form-control", id: "email_input", value: assigns[:email] %>
-    <div class="has-error"><%= error_tag f, :email %></div>
-    <div class="has-error"><%= error_tag f, :org_users %></div>
+    <%= email_input(f, :email, class: "form-control", id: "email_input", value: assigns[:email]) %>
+    <div class="has-error"><%= error_tag(f, :email) %></div>
+    <div class="has-error"><%= error_tag(f, :org_users) %></div>
   </div>
 
   <div class="form-group">
@@ -29,8 +29,6 @@
 
   <div class="button-submit-wrapper">
     <a class="btn btn-outline-light" href={Routes.org_user_path(@conn, :index, @org.name)}>Cancel</a>
-    <%= submit "Send Invitation", class: "btn btn-primary" %>
+    <%= submit("Send Invitation", class: "btn btn-primary") %>
   </div>
 <% end %>
-
-
diff --git a/lib/nerves_hub_web/templates/org/new.html.heex b/lib/nerves_hub_web/templates/org/new.html.heex
index ef45148c4..e79b986de 100644
--- a/lib/nerves_hub_web/templates/org/new.html.heex
+++ b/lib/nerves_hub_web/templates/org/new.html.heex
@@ -1,3 +1,3 @@
 <h1 class="pt-4">Create New Organization</h1>
 
-<%= render "form.html", Map.put(assigns, :action, Routes.org_path(@conn, :create)) %>
+<%= render("form.html", Map.put(assigns, :action, Routes.org_path(@conn, :create))) %>
diff --git a/lib/nerves_hub_web/templates/org_certificate/edit.html.heex b/lib/nerves_hub_web/templates/org_certificate/edit.html.heex
index becb8962a..f5b37588e 100644
--- a/lib/nerves_hub_web/templates/org_certificate/edit.html.heex
+++ b/lib/nerves_hub_web/templates/org_certificate/edit.html.heex
@@ -2,25 +2,25 @@
 
 <%= form_for @changeset, Routes.org_certificate_path(@conn, :update, @org.name, @serial), fn f -> %>
   <div class="form-group">
-    <%= label f, :description, for: "description_input" %>
-    <%= text_input f, :description , class: "form-control", id: "description_input" %>
-    <div class="has-error"><%= error_tag f, :description %></div>
+    <%= label(f, :description, for: "description_input") %>
+    <%= text_input(f, :description, class: "form-control", id: "description_input") %>
+    <div class="has-error"><%= error_tag(f, :description) %></div>
   </div>
 
   <div class="form-group">
     <div class="help-text mb-1 tooltip-label help-tooltip">
-      <%= label f, :check_expiration, for: "check_expiration_input" %>
+      <%= label(f, :check_expiration, for: "check_expiration_input") %>
       <span class="tooltip-info"></span>
       <span class="tooltip-text"><%= check_expiration_help_text() %></span>
     </div>
-    <%= checkbox f, :check_expiration , class: "", id: "check_expiration_input" %>
-    <div class="has-error"><%= error_tag f, :check_expiration %></div>
+    <%= checkbox(f, :check_expiration, class: "", id: "check_expiration_input") %>
+    <div class="has-error"><%= error_tag(f, :check_expiration) %></div>
   </div>
 
   <%= inputs_for f, :jitp, fn fp -> %>
     <label for="jitp_toggle"> Enable Just In Time Provisioning </label>
-    <input type="checkbox" name="jitp_toggle" id="jitp_toggle" {if f.data.jitp, do: [checked: true], else: []}>
-    <%= hidden_input fp, :delete, id: "jitp-delete" %>
+    <input type="checkbox" name="jitp_toggle" id="jitp_toggle" {if f.data.jitp, do: [checked: true], else: []} />
+    <%= hidden_input(fp, :delete, id: "jitp-delete") %>
     <div {unless f.data.jitp, do: [hidden: true], else: []} id="jitp_form">
       <div class="form-group">
         <label for="description_input" class="tooltip-label h3 mb-1">
@@ -28,8 +28,8 @@
           <span class="tooltip-info"></span>
           <span class="tooltip-text">Device Description</span>
         </label>
-        <%= text_input fp, :description, class: "form-control", id: "description_input" %>
-        <div class="has-error"><%= error_tag fp, :description %></div>
+        <%= text_input(fp, :description, class: "form-control", id: "description_input") %>
+        <div class="has-error"><%= error_tag(fp, :description) %></div>
       </div>
 
       <div class="form-group" aria-hidden="true">
@@ -38,8 +38,8 @@
           <span class="tooltip-info"></span>
           <span class="tooltip-text">Tags are used by deployments to target a device. A device must have matching tag(s) for the deployment to update it</span>
         </label>
-        <%= text_input fp, :tags, class: "form-control", id: "tag_input" %>
-        <div class="has-error"><%= error_tag fp, :tags %></div>
+        <%= text_input(fp, :tags, class: "form-control", id: "tag_input") %>
+        <div class="has-error"><%= error_tag(fp, :tags) %></div>
       </div>
 
       <div class="form-group" aria-hidden="true">
@@ -48,21 +48,21 @@
           <span class="tooltip-info"></span>
           <span class="tooltip-text">JITP must be configured to use a particular product</span>
         </label>
-        <%= select fp, :product_id, Enum.map(@products, &{&1.name, &1.id}), class: "form-control", id: "product_input" %>
-        <div class="has-error"><%= error_tag fp, :product_id %></div>
+        <%= select(fp, :product_id, Enum.map(@products, &{&1.name, &1.id}), class: "form-control", id: "product_input") %>
+        <div class="has-error"><%= error_tag(fp, :product_id) %></div>
       </div>
     </div>
   <% end %>
 
   <div class="button-submit-wrapper">
-    <%= link "Back", to: Routes.org_certificate_path(@conn, :index, @org.name), class: "btn btn-outline-light" %>
-    <%= submit "Update Certificate", class: "btn btn-primary" %>
+    <%= link("Back", to: Routes.org_certificate_path(@conn, :index, @org.name), class: "btn btn-outline-light") %>
+    <%= submit("Update Certificate", class: "btn btn-primary") %>
   </div>
 <% end %>
 
 <script>
-document.getElementById("jitp_toggle").onclick = function() {
-  document.getElementById("jitp_form").hidden = !this.checked;
-  document.getElementById("jitp-delete").value = !this.checked;
-}
+  document.getElementById("jitp_toggle").onclick = function() {
+    document.getElementById("jitp_form").hidden = !this.checked;
+    document.getElementById("jitp-delete").value = !this.checked;
+  }
 </script>
diff --git a/lib/nerves_hub_web/templates/org_certificate/index.html.heex b/lib/nerves_hub_web/templates/org_certificate/index.html.heex
index 7606e378b..d693f6e2c 100644
--- a/lib/nerves_hub_web/templates/org_certificate/index.html.heex
+++ b/lib/nerves_hub_web/templates/org_certificate/index.html.heex
@@ -15,7 +15,7 @@
       <th>Not before</th>
       <th>Not after</th>
       <th>Check expiration?</th>
-      <th>JITP Enabled? </th>
+      <th>JITP Enabled?</th>
     </tr>
   </thead>
   <tbody>
@@ -63,8 +63,13 @@
               <img src="/images/icons/more.svg" alt="options" />
             </a>
             <div class="dropdown-menu dropdown-menu-right">
-              <%= link "Edit", class: "dropdown-item", to: Routes.org_certificate_path(@conn, :edit, @org.name, cert.serial) %>
-              <%= link "Delete", class: "dropdown-item", to: Routes.org_certificate_path(@conn, :delete, @org.name, cert.serial), method: :delete, data: [confirm: "Are you sure you want to delete this certificate? This can not be undone."] %>
+              <%= link("Edit", class: "dropdown-item", to: Routes.org_certificate_path(@conn, :edit, @org.name, cert.serial)) %>
+              <%= link("Delete",
+                class: "dropdown-item",
+                to: Routes.org_certificate_path(@conn, :delete, @org.name, cert.serial),
+                method: :delete,
+                data: [confirm: "Are you sure you want to delete this certificate? This can not be undone."]
+              ) %>
             </div>
           </div>
         </td>
diff --git a/lib/nerves_hub_web/templates/org_certificate/new.html.heex b/lib/nerves_hub_web/templates/org_certificate/new.html.heex
index e44b1e677..b0587b515 100644
--- a/lib/nerves_hub_web/templates/org_certificate/new.html.heex
+++ b/lib/nerves_hub_web/templates/org_certificate/new.html.heex
@@ -1,25 +1,25 @@
 <h1>New Certificate Authority</h1>
 
 <%= form_for @changeset, Routes.org_certificate_path(@conn, :create, @org.name), [multipart: true], fn f -> %>
-  <h3> Step 1 </h3>
-  <p> Generate a key pair for the private key verification certificate </p>
+  <h3>Step 1</h3>
+  <p>Generate a key pair for the private key verification certificate</p>
   <pre><code class="language-bash">
   openssl genrsa -out verificationCert.key 2048
   </code></pre>
 
-  <h3> Step 2 </h3>
-  <p> Copy this registration code to your clipboard </p>
+  <h3>Step 2</h3>
+  <p>Copy this registration code to your clipboard</p>
   <pre><code class="language-bash">
   <%= @registration_code %>
   </code></pre>
 
-  <h3> Step 3 </h3>
-  <p> Create a CSR with this registration code </p>
+  <h3>Step 3</h3>
+  <p>Create a CSR with this registration code</p>
   <pre><code class="language-bash">
   openssl req -new -key verificationCert.key -out verificationCert.csr
   </code></pre>
 
-  <p> Put the registration code in the <b> Common Name </b> field </p>
+  <p>Put the registration code in the <b> Common Name </b> field</p>
   <pre><code class="language-bash">
   Country Name (2 letter code) [AU]:
   State or Province Name (full name) [Some-State]:
@@ -30,32 +30,31 @@
   Email Address []:
   </code></pre>
 
-  <h3> Step 4 </h3>
-  <p> Use the CSR that was signed with the CA private key to create a private key verification certificate </p>
+  <h3>Step 4</h3>
+  <p>Use the CSR that was signed with the CA private key to create a private key verification certificate</p>
   <pre><code class="language-bash">
   openssl x509 -req -in verificationCert.csr -CA rootCA.pem -CAkey rootCA.key -CAcreateserial -out verificationCert.crt -days 500 -sha256
   </code></pre>
 
   <div class="form-group">
-    <%= label f, :description, for: "description_input" %>
-    <%= text_input f, :description , class: "form-control", id: "description_input" %>
-    <div class="has-error"><%= error_tag f, :description %></div>
+    <%= label(f, :description, for: "description_input") %>
+    <%= text_input(f, :description, class: "form-control", id: "description_input") %>
+    <div class="has-error"><%= error_tag(f, :description) %></div>
   </div>
 
   <div class="form-group">
     <div class="help-text mb-1 tooltip-label help-tooltip">
-      <%= label f, :check_expiration, for: "check_expiration_input" %>
+      <%= label(f, :check_expiration, for: "check_expiration_input") %>
       <span class="tooltip-info"></span>
       <span class="tooltip-text"><%= check_expiration_help_text() %></span>
     </div>
-    <%= checkbox f, :check_expiration , class: "", id: "check_expiration_input" %>
-    <div class="has-error"><%= error_tag f, :check_expiration %></div>
+    <%= checkbox(f, :check_expiration, class: "", id: "check_expiration_input") %>
+    <div class="has-error"><%= error_tag(f, :check_expiration) %></div>
   </div>
 
-
   <%= inputs_for f, :jitp, fn fp -> %>
     <label for="jitp_toggle"> Enable Just In Time Provisioning </label>
-    <%= checkbox fp, :jitp_toggle, id: "jitp_toggle" %>
+    <%= checkbox(fp, :jitp_toggle, id: "jitp_toggle") %>
     <div hidden id="jitp_form">
       <div class="form-group">
         <label for="description_input" class="tooltip-label h3 mb-1">
@@ -63,8 +62,8 @@
           <span class="tooltip-info"></span>
           <span class="tooltip-text">Device Description</span>
         </label>
-        <%= text_input fp, :description, class: "form-control", id: "description_input" %>
-        <div class="has-error"><%= error_tag fp, :description %></div>
+        <%= text_input(fp, :description, class: "form-control", id: "description_input") %>
+        <div class="has-error"><%= error_tag(fp, :description) %></div>
       </div>
 
       <div class="form-group" aria-hidden="true">
@@ -73,8 +72,8 @@
           <span class="tooltip-info"></span>
           <span class="tooltip-text">Tags are used by deployments to target a device. A device must have matching tag(s) for the deployment to update it</span>
         </label>
-        <%= text_input fp, :tags, class: "form-control", id: "tag_input" %>
-        <div class="has-error"><%= error_tag fp, :tags %></div>
+        <%= text_input(fp, :tags, class: "form-control", id: "tag_input") %>
+        <div class="has-error"><%= error_tag(fp, :tags) %></div>
       </div>
 
       <div class="form-group" aria-hidden="true">
@@ -83,32 +82,32 @@
           <span class="tooltip-info"></span>
           <span class="tooltip-text">JITP must be configured to use a particular product</span>
         </label>
-        <%= select fp, :product_id, Enum.map(@products, &{&1.name, &1.id}), class: "form-control", id: "product_input", prompt: "Select Product" %>
-        <div class="has-error"><%= error_tag fp, :product_id %></div>
+        <%= select(fp, :product_id, Enum.map(@products, &{&1.name, &1.id}), class: "form-control", id: "product_input", prompt: "Select Product") %>
+        <div class="has-error"><%= error_tag(fp, :product_id) %></div>
       </div>
     </div>
   <% end %>
 
   <div class="form-group custom-upload-group">
-    <%= label f, :cert, "Upload a Certificate Authority file (rootCA.pem)", class: "custom-upload-label not-selected", for: "cert_input" %>
-    <%= file_input f, :cert, required: true, class: "custom-upload-input hidden", id: "cert_input", accept: ".pem" %>
-    <div class="has-error"><%= error_tag f, :cert %></div>
+    <%= label(f, :cert, "Upload a Certificate Authority file (rootCA.pem)", class: "custom-upload-label not-selected", for: "cert_input") %>
+    <%= file_input(f, :cert, required: true, class: "custom-upload-input hidden", id: "cert_input", accept: ".pem") %>
+    <div class="has-error"><%= error_tag(f, :cert) %></div>
   </div>
 
   <div class="form-group custom-upload-group">
-    <%= label f, :csr, "Upload a Certificate Authority file (verificationCert.crt)", class: "custom-upload-label not-selected", for: "csr_input" %>
-    <%= file_input f, :csr, required: true, class: "custom-upload-input hidden", id: "csr_input", accept: ".crt" %>
-    <div class="has-error"><%= error_tag f, :csr %></div>
+    <%= label(f, :csr, "Upload a Certificate Authority file (verificationCert.crt)", class: "custom-upload-label not-selected", for: "csr_input") %>
+    <%= file_input(f, :csr, required: true, class: "custom-upload-input hidden", id: "csr_input", accept: ".crt") %>
+    <div class="has-error"><%= error_tag(f, :csr) %></div>
   </div>
 
   <div class="button-submit-wrapper">
-    <%= link "Back", to: Routes.org_certificate_path(@conn, :index, @org.name), class: "btn btn-outline-light" %>
-    <%= submit "Create Certificate", class: "btn btn-primary" %>
+    <%= link("Back", to: Routes.org_certificate_path(@conn, :index, @org.name), class: "btn btn-outline-light") %>
+    <%= submit("Create Certificate", class: "btn btn-primary") %>
   </div>
 <% end %>
 
 <script>
-document.getElementById("jitp_toggle").onclick = function() {
-  document.getElementById("jitp_form").hidden = !this.checked;
-}
+  document.getElementById("jitp_toggle").onclick = function() {
+    document.getElementById("jitp_form").hidden = !this.checked;
+  }
 </script>
diff --git a/lib/nerves_hub_web/templates/org_key/edit.html.heex b/lib/nerves_hub_web/templates/org_key/edit.html.heex
index 25debf74e..a553099b0 100644
--- a/lib/nerves_hub_web/templates/org_key/edit.html.heex
+++ b/lib/nerves_hub_web/templates/org_key/edit.html.heex
@@ -1,3 +1,3 @@
 <h1>Edit Firmware Key</h1>
 
-<%= render "form.html", Map.put(assigns, :action, Routes.org_key_path(@conn, :update, @org.name, @org_key)) %>
+<%= render("form.html", Map.put(assigns, :action, Routes.org_key_path(@conn, :update, @org.name, @org_key))) %>
diff --git a/lib/nerves_hub_web/templates/org_key/form.html.heex b/lib/nerves_hub_web/templates/org_key/form.html.heex
index 5a06aa7e2..a12a17e1a 100644
--- a/lib/nerves_hub_web/templates/org_key/form.html.heex
+++ b/lib/nerves_hub_web/templates/org_key/form.html.heex
@@ -1,30 +1,34 @@
 <%= form_for @changeset, @action, fn f -> %>
   <%= if @changeset.action do %>
     <div class="alert alert-danger">
-      <p> <%= top_level_error_message(@changeset) %> </p>
+      <p><%= top_level_error_message(@changeset) %></p>
     </div>
   <% end %>
 
   <div class="form-group">
-    <%= label f, :name, for: "name_input" %>
-    <%= text_input f, :name , class: "form-control", id: "name_input" %>
-    <div class="has-error"><%= error_tag f, :name %></div>
+    <%= label(f, :name, for: "name_input") %>
+    <%= text_input(f, :name, class: "form-control", id: "name_input") %>
+    <div class="has-error"><%= error_tag(f, :name) %></div>
   </div>
 
   <div class="form-group">
-    <%= label f, :key, for: "key_input" %>
-    <%= text_input f, :key , class: "form-control", id: "key_input" %>
-    <div class="has-error"><%= error_tag f, :key %></div>
+    <%= label(f, :key, for: "key_input") %>
+    <%= text_input(f, :key, class: "form-control", id: "key_input") %>
+    <div class="has-error"><%= error_tag(f, :key) %></div>
   </div>
 
   <div class="button-submit-wrapper">
-    <%= link "Back", to: Routes.org_key_path(@conn, :index, @org.name), class: "btn btn-outline-light" %>
+    <%= link("Back", to: Routes.org_key_path(@conn, :index, @org.name), class: "btn btn-outline-light") %>
     <%= if assigns[:org_key] do %>
-      <%= link "Remove", to: Routes.org_key_path(@conn, :delete, @org.name, @org_key), method: :delete, data: [confirm: "Are you sure you want to delete this firmware key? This can not be undone."], class: "btn btn-secondary" %>
-      <%= submit "Save Changes", class: "btn btn-primary" %>
+      <%= link("Remove",
+        to: Routes.org_key_path(@conn, :delete, @org.name, @org_key),
+        method: :delete,
+        data: [confirm: "Are you sure you want to delete this firmware key? This can not be undone."],
+        class: "btn btn-secondary"
+      ) %>
+      <%= submit("Save Changes", class: "btn btn-primary") %>
     <% else %>
-      <%= submit "Create Key", class: "btn btn-primary" %>
+      <%= submit("Create Key", class: "btn btn-primary") %>
     <% end %>
-
   </div>
 <% end %>
diff --git a/lib/nerves_hub_web/templates/org_key/new.html.heex b/lib/nerves_hub_web/templates/org_key/new.html.heex
index c76b189ba..13fdfac36 100644
--- a/lib/nerves_hub_web/templates/org_key/new.html.heex
+++ b/lib/nerves_hub_web/templates/org_key/new.html.heex
@@ -1,3 +1,3 @@
 <h1>New Firmware Key</h1>
 
-<%= render "form.html", Map.put(assigns, :action, Routes.org_key_path(@conn, :create, @org.name)) %>
+<%= render("form.html", Map.put(assigns, :action, Routes.org_key_path(@conn, :create, @org.name))) %>
diff --git a/lib/nerves_hub_web/templates/org_key/show.html.heex b/lib/nerves_hub_web/templates/org_key/show.html.heex
index 5f7164dcb..1df4fb674 100644
--- a/lib/nerves_hub_web/templates/org_key/show.html.heex
+++ b/lib/nerves_hub_web/templates/org_key/show.html.heex
@@ -1,8 +1,6 @@
 <h1>Show organization keys</h1>
 
-<ul>
+<ul></ul>
 
-</ul>
-
-<span><%= link "Edit", to: Routes.org_key_path(@conn, :edit, @org.name, @org_key) %></span>
-<span><%= link "Back", to: Routes.org_key_path(@conn, :index, @org.name) %></span>
+<span><%= link("Edit", to: Routes.org_key_path(@conn, :edit, @org.name, @org_key)) %></span>
+<span><%= link("Back", to: Routes.org_key_path(@conn, :index, @org.name)) %></span>
diff --git a/lib/nerves_hub_web/templates/org_user/edit.html.heex b/lib/nerves_hub_web/templates/org_user/edit.html.heex
index 278ef0042..e5ecdc93e 100644
--- a/lib/nerves_hub_web/templates/org_user/edit.html.heex
+++ b/lib/nerves_hub_web/templates/org_user/edit.html.heex
@@ -8,14 +8,14 @@
       <span>Role</span>
     </label>
     <div class="pos-rel">
-      <%= select f, :role, role_options(), class: "form-control", id: "role_input" %>
+      <%= select(f, :role, role_options(), class: "form-control", id: "role_input") %>
       <div class="select-icon"></div>
     </div>
-    <div class="has-error"><%= error_tag f, :role %></div>
+    <div class="has-error"><%= error_tag(f, :role) %></div>
   </div>
 
   <div class="button-submit-wrapper">
     <a class="btn btn-outline-light" href={Routes.org_user_path(@conn, :index, @org.name)}>Cancel</a>
-    <%= submit "Update", class: "btn btn-primary" %>
+    <%= submit("Update", class: "btn btn-primary") %>
   </div>
 <% end %>
diff --git a/lib/nerves_hub_web/templates/org_user/index.html.heex b/lib/nerves_hub_web/templates/org_user/index.html.heex
index ae78e7fbf..b90d29145 100644
--- a/lib/nerves_hub_web/templates/org_user/index.html.heex
+++ b/lib/nerves_hub_web/templates/org_user/index.html.heex
@@ -66,9 +66,14 @@
                 <img src="/images/icons/more.svg" alt="options" />
               </a>
               <div class="dropdown-menu dropdown-menu-right">
-                <%= link "edit", class: "dropdown-item", to: Routes.org_user_path(@conn, :edit, @org.name, org_user.user_id) %>
+                <%= link("edit", class: "dropdown-item", to: Routes.org_user_path(@conn, :edit, @org.name, org_user.user_id)) %>
                 <div class="dropdown-divider"></div>
-                <%= link "Delete", class: "dropdown-item", to: Routes.org_user_path(@conn, :delete, @org.name, org_user.user_id), method: :delete, data: [confirm: "Are you sure you want to remove this user? This can not be undone."] %>
+                <%= link("Delete",
+                  class: "dropdown-item",
+                  to: Routes.org_user_path(@conn, :delete, @org.name, org_user.user_id),
+                  method: :delete,
+                  data: [confirm: "Are you sure you want to remove this user? This can not be undone."]
+                ) %>
               </div>
             </div>
           </td>
diff --git a/lib/nerves_hub_web/templates/password_reset/new.html.heex b/lib/nerves_hub_web/templates/password_reset/new.html.heex
index bfed8a8b8..58f01402b 100644
--- a/lib/nerves_hub_web/templates/password_reset/new.html.heex
+++ b/lib/nerves_hub_web/templates/password_reset/new.html.heex
@@ -3,10 +3,10 @@
   <%= form_for @changeset, Routes.password_reset_path(@conn, :create), [class: "form-page"], fn f -> %>
     <div class="form-group">
       <label for="email">Email</label>
-      <%= email_input f, :email, class: "form-control", id: "email" %>
-      <div class="has-error"><%= error_tag f, :email %></div>
+      <%= email_input(f, :email, class: "form-control", id: "email") %>
+      <div class="has-error"><%= error_tag(f, :email) %></div>
     </div>
 
-    <%= submit "Submit", class: "btn btn-primary btn-lg" %>
+    <%= submit("Submit", class: "btn btn-primary btn-lg") %>
   <% end %>
 </div>
diff --git a/lib/nerves_hub_web/templates/password_reset/new_password_form.html.heex b/lib/nerves_hub_web/templates/password_reset/new_password_form.html.heex
index c24f00d8b..26b35628e 100644
--- a/lib/nerves_hub_web/templates/password_reset/new_password_form.html.heex
+++ b/lib/nerves_hub_web/templates/password_reset/new_password_form.html.heex
@@ -3,16 +3,16 @@
   <%= form_for @changeset, Routes.password_reset_path(@conn, :reset, @token), [class: "form-page"], fn f -> %>
     <div class="form-group">
       <label for="password">New Password</label>
-      <%= password_input f, :password, class: "form-control", id: "password" %>
-      <div class="has-error"><%= error_tag f, :password %></div>
+      <%= password_input(f, :password, class: "form-control", id: "password") %>
+      <div class="has-error"><%= error_tag(f, :password) %></div>
     </div>
 
     <div class="form-group">
       <label for="password-confirmation">Confirm New Password</label>
-      <%= password_input f, :password_confirmation, class: "form-control", id: "password-confirmation" %>
-      <div class="has-error"><%= error_tag f, :password_confirmation %></div>
+      <%= password_input(f, :password_confirmation, class: "form-control", id: "password-confirmation") %>
+      <div class="has-error"><%= error_tag(f, :password_confirmation) %></div>
     </div>
 
-    <%= submit "Submit", class: "btn btn-primary btn-lg" %>
+    <%= submit("Submit", class: "btn btn-primary btn-lg") %>
   <% end %>
 </div>
diff --git a/lib/nerves_hub_web/templates/product/edit.html.heex b/lib/nerves_hub_web/templates/product/edit.html.heex
index ed3ffcd26..b47333d5a 100644
--- a/lib/nerves_hub_web/templates/product/edit.html.heex
+++ b/lib/nerves_hub_web/templates/product/edit.html.heex
@@ -1,3 +1,3 @@
 <h1>Product Settings</h1>
 
-<%= render "form.html", Map.put(assigns, :action, Routes.product_path(@conn, :update, @org.name, @product.name)) %>
+<%= render("form.html", Map.put(assigns, :action, Routes.product_path(@conn, :update, @org.name, @product.name))) %>
diff --git a/lib/nerves_hub_web/templates/product/form.html.heex b/lib/nerves_hub_web/templates/product/form.html.heex
index 317704702..45d3e1cc4 100644
--- a/lib/nerves_hub_web/templates/product/form.html.heex
+++ b/lib/nerves_hub_web/templates/product/form.html.heex
@@ -12,38 +12,41 @@
       <span class="tooltip-text">Once created, a product name cannot be changed</span>
     </label>
     <%= if assigns[:product] do %>
-      <%= text_input f, :name, class: "form-control", disabled: "true", id: "name_input" %>
+      <%= text_input(f, :name, class: "form-control", disabled: "true", id: "name_input") %>
     <% else %>
-      <%= text_input f, :name, class: "form-control", id: "name_input" %>
+      <%= text_input(f, :name, class: "form-control", id: "name_input") %>
     <% end %>
-    <div class="has-error"><%= error_tag f, :name %></div>
+    <div class="has-error"><%= error_tag(f, :name) %></div>
   </div>
 
   <div class="form-group">
-      <label for="delta_updatable_input" class="tooltip-label">
+    <label for="delta_updatable_input" class="tooltip-label">
       <span>Firmware updates</span>
       <span class="tooltip-info"></span>
       <span class="tooltip-text">
-        Check out the documentation at
-        <a href="https://docs.nerves-hub.org" target="_blank" class="inline">https://docs.nerves-hub.org </a>
-        for more information about
-        <a href="https://docs.nerves-hub.org/nerves-hub/setup/firmware#delta-updates" target="_blank" class="inline">delta updates</a>
+        Check out the documentation at <a href="https://docs.nerves-hub.org" target="_blank" class="inline">https://docs.nerves-hub.org </a>
+        for more information about <a href="https://docs.nerves-hub.org/nerves-hub/setup/firmware#delta-updates" target="_blank" class="inline">delta updates</a>
       </span>
     </label>
     <div class="flex-row align-items-center">
-      <%= checkbox f, :delta_updatable, class: "form-control checkbox", id: "delta_updatable_input" %>
+      <%= checkbox(f, :delta_updatable, class: "form-control checkbox", id: "delta_updatable_input") %>
       <label for="delta_updatable_input" class="color-white pl-1 m-0">Enable delta firmware updates</label>
     </div>
 
-    <div class="has-error"><%= error_tag f, :delta_updatable %></div>
+    <div class="has-error"><%= error_tag(f, :delta_updatable) %></div>
   </div>
 
   <div class="button-submit-wrapper">
     <%= if assigns[:product] do %>
-      <%= link "Remove Product", class: "btn btn-secondary", to: Routes.product_path(@conn, :delete, @org.name, @product.name), method: :delete, data: [confirm: "Are you sure you want to delete this product? This can not be undone."] %>
-      <%= submit "Save Changes", class: "btn btn-primary" %>
+      <%= link("Remove Product",
+        class: "btn btn-secondary",
+        to: Routes.product_path(@conn, :delete, @org.name, @product.name),
+        method: :delete,
+        data: [confirm: "Are you sure you want to delete this product? This can not be undone."]
+      ) %>
+      <%= submit("Save Changes", class: "btn btn-primary") %>
     <% else %>
-      <%= submit "Create Product", class: "btn btn-primary" %>
+      <%= submit("Create Product", class: "btn btn-primary") %>
     <% end %>
   </div>
 <% end %>
diff --git a/lib/nerves_hub_web/templates/product/new.html.heex b/lib/nerves_hub_web/templates/product/new.html.heex
index 8ba4bb0f7..24f996716 100644
--- a/lib/nerves_hub_web/templates/product/new.html.heex
+++ b/lib/nerves_hub_web/templates/product/new.html.heex
@@ -1,3 +1,3 @@
 <h1>Create Product</h1>
 
-<%= render "form.html", Map.put(assigns, :action, Routes.product_path(@conn, :create, @org.name)) %>
+<%= render("form.html", Map.put(assigns, :action, Routes.product_path(@conn, :create, @org.name))) %>
diff --git a/lib/nerves_hub_web/templates/session/new.html.heex b/lib/nerves_hub_web/templates/session/new.html.heex
index d6f629384..a3848e003 100644
--- a/lib/nerves_hub_web/templates/session/new.html.heex
+++ b/lib/nerves_hub_web/templates/session/new.html.heex
@@ -3,8 +3,8 @@
   <%= form_for @conn, Routes.session_path(@conn, :create), [as: :login, class: "form-page"], fn f -> %>
     <div class="form-group">
       <label for="email_or_username">Email/Username</label>
-      <%= text_input f, :email_or_username, class: "form-control", id: "email_or_username" %>
-      <%= error_tag f, :email_or_username %>
+      <%= text_input(f, :email_or_username, class: "form-control", id: "email_or_username") %>
+      <%= error_tag(f, :email_or_username) %>
     </div>
 
     <div class="form-group">
@@ -14,11 +14,11 @@
           Forgot Password
         </a>
       </div>
-      <%= password_input f, :password, class: "form-control", id: "password_input" %>
-      <div class="has-error"><%= error_tag f, :password %></div>
+      <%= password_input(f, :password, class: "form-control", id: "password_input") %>
+      <div class="has-error"><%= error_tag(f, :password) %></div>
     </div>
     <div class="flex-column align-items-center">
-      <%= submit "Login", class: "btn btn-primary btn-lg w-100" %>
+      <%= submit("Login", class: "btn btn-primary btn-lg w-100") %>
     </div>
   <% end %>
 </div>
diff --git a/lib/nerves_hub_web/templates/token/new.html.heex b/lib/nerves_hub_web/templates/token/new.html.heex
index 505e505f3..815801db6 100644
--- a/lib/nerves_hub_web/templates/token/new.html.heex
+++ b/lib/nerves_hub_web/templates/token/new.html.heex
@@ -1,9 +1,9 @@
 <%= form_for @changeset, Routes.token_path(@conn, :create, @user.username), [class: "form-group"], fn f -> %>
   <label for="note_input">Note</label>
-  <%= text_input f, :note, class: "form-control" %>
-  <div class="has-error"><%= error_tag f, :note %></div>
+  <%= text_input(f, :note, class: "form-control") %>
+  <div class="has-error"><%= error_tag(f, :note) %></div>
   <div class="button-submit-wrapper">
     <%= link("Cancel", to: Routes.token_path(@conn, :index, @user.username), class: "btn btn-secondary") %>
-    <%= submit "Generate", class: "btn btn-primary" %>
+    <%= submit("Generate", class: "btn btn-primary") %>
   </div>
 <% end %>