diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6b8a4931..0e745180 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -63,6 +63,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+          cache: 'npm'
+          cache-dependency-path: assets/package-lock.json
       - uses: erlef/setup-elixir@v1
         with:
           otp-version: ${{matrix.otp}}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf42f689..9e402d65 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,32 @@
 # Changelog
 
+## [v3.6.4](https://github.com/mojotech/torch/tree/v3.6.4) (2021-11-02)
+
+[Full Changelog](https://github.com/mojotech/torch/compare/v3.6.3...v3.6.4)
+
+**Closed issues:**
+
+- Searching with Equals Filter Swaps to Contains after submit [\#270](https://github.com/mojotech/torch/issues/270)
+- Removed deprecated usage of core methods. [\#211](https://github.com/mojotech/torch/issues/211)
+
+**Merged pull requests:**
+
+- Fix ordering of FilterView.find_param for :select [\#271](https://github.com/mojotech/torch/pull/271) ([thedelchop](https://github.com/thedelchop))
+- Remove usage of deprecated method [\#268](https://github.com/mojotech/torch/pull/268) ([cpjolicoeur](https://github.com/cpjolicoeur))
+- Bump excoveralls from 0.14.1 to 0.14.2 [\#249](https://github.com/mojotech/torch/pull/249) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump ex_unit_notifier from 1.1.0 to 1.2.0 [\#248](https://github.com/mojotech/torch/pull/248) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Misc doc changes [\#247](https://github.com/mojotech/torch/pull/247) ([kianmeng](https://github.com/kianmeng))
+- Update CI test matrix to include latest IEX and OTP [\#245](https://github.com/mojotech/torch/pull/245) ([cpjolicoeur](https://github.com/cpjolicoeur))
+- Bump browserslist from 4.12.0 to 4.16.6 in /assets [\#233](https://github.com/mojotech/torch/pull/233) ([dependabot[bot]](https://github.com/apps/dependabot))
+
+## [v3.7.0-rc.0](https://github.com/mojotech/torch/tree/v3.7.0-rc.0) (2021-09-15)
+
+[Full Changelog](https://github.com/mojotech/torch/compare/v3.6.3...v3.7.0-rc.0)
+
+**Closed issues:**
+
+- References on Admin Page [\#147](https://github.com/mojotech/torch/issues/147)
+
 ## [v3.6.3](https://github.com/mojotech/torch/tree/v3.6.3) (2021-06-30)
 
 [Full Changelog](https://github.com/mojotech/torch/compare/v3.6.2...v3.6.3)
@@ -29,8 +56,8 @@
 **Merged pull requests:**
 
 - Fix bug with multiple filters w/ the same prefix [\#243](https://github.com/mojotech/torch/pull/243) ([cpjolicoeur](https://github.com/cpjolicoeur))
-- Bump mix\_test\_watch from 1.0.2 to 1.0.3 [\#239](https://github.com/mojotech/torch/pull/239) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Bump ex\_doc from 0.24.1 to 0.24.2 [\#238](https://github.com/mojotech/torch/pull/238) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump mix_test_watch from 1.0.2 to 1.0.3 [\#239](https://github.com/mojotech/torch/pull/239) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump ex_doc from 0.24.1 to 0.24.2 [\#238](https://github.com/mojotech/torch/pull/238) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump credo from 1.5.5 to 1.5.6 [\#237](https://github.com/mojotech/torch/pull/237) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump excoveralls from 0.14.0 to 0.14.1 [\#236](https://github.com/mojotech/torch/pull/236) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Test templates updated with best-practice describes [\#235](https://github.com/mojotech/torch/pull/235) ([d4rk5eed](https://github.com/d4rk5eed))
@@ -39,16 +66,16 @@
 - Bump y18n from 4.0.0 to 4.0.3 in /assets [\#221](https://github.com/mojotech/torch/pull/221) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Upgrade to GitHub-native Dependabot [\#219](https://github.com/mojotech/torch/pull/219) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 - \[mix\] Remove direct dependency on Timex [\#217](https://github.com/mojotech/torch/pull/217) ([cpjolicoeur](https://github.com/cpjolicoeur))
-- Bump ex\_doc from 0.23.0 to 0.24.1 [\#215](https://github.com/mojotech/torch/pull/215) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Bump ex_doc from 0.23.0 to 0.24.1 [\#215](https://github.com/mojotech/torch/pull/215) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 - \[fix\] Ensure only the Torch layout is used on Phx 1.5 [\#212](https://github.com/mojotech/torch/pull/212) ([cpjolicoeur](https://github.com/cpjolicoeur))
-- Bump ex\_unit\_notifier from 1.0.0 to 1.1.0 [\#209](https://github.com/mojotech/torch/pull/209) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Bump ex_unit_notifier from 1.0.0 to 1.1.0 [\#209](https://github.com/mojotech/torch/pull/209) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 - Bump excoveralls from 0.13.4 to 0.14.0 [\#208](https://github.com/mojotech/torch/pull/208) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 - Bump credo from 1.5.4 to 1.5.5 [\#206](https://github.com/mojotech/torch/pull/206) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 - Bump excoveralls from 0.13.1 to 0.13.4 [\#203](https://github.com/mojotech/torch/pull/203) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 - Bump credo from 1.4.1 to 1.5.4 [\#202](https://github.com/mojotech/torch/pull/202) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 - Bump timex from 3.6.2 to 3.6.3 [\#201](https://github.com/mojotech/torch/pull/201) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump ex\_unit\_notifier from 0.1.4 to 1.0.0 [\#200](https://github.com/mojotech/torch/pull/200) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump ex\_doc from 0.22.5 to 0.23.0 [\#195](https://github.com/mojotech/torch/pull/195) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Bump ex_unit_notifier from 0.1.4 to 1.0.0 [\#200](https://github.com/mojotech/torch/pull/200) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Bump ex_doc from 0.22.5 to 0.23.0 [\#195](https://github.com/mojotech/torch/pull/195) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 
 ## [v3.6.1](https://github.com/mojotech/torch/tree/v3.6.1) (2021-03-19)
 
@@ -83,10 +110,10 @@
 - Update GH Actions hooks [\#186](https://github.com/mojotech/torch/pull/186) ([cpjolicoeur](https://github.com/cpjolicoeur))
 - Add Github Actions CI config [\#185](https://github.com/mojotech/torch/pull/185) ([cpjolicoeur](https://github.com/cpjolicoeur))
 - Bump jason from 1.2.1 to 1.2.2 [\#184](https://github.com/mojotech/torch/pull/184) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump ex\_doc from 0.22.2 to 0.22.5 [\#183](https://github.com/mojotech/torch/pull/183) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Bump ex_doc from 0.22.2 to 0.22.5 [\#183](https://github.com/mojotech/torch/pull/183) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 - Bump gettext from 0.18.0 to 0.18.1 [\#181](https://github.com/mojotech/torch/pull/181) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 - Bump excoveralls from 0.13.0 to 0.13.1 [\#180](https://github.com/mojotech/torch/pull/180) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump ex\_doc from 0.22.1 to 0.22.2 [\#179](https://github.com/mojotech/torch/pull/179) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Bump ex_doc from 0.22.1 to 0.22.2 [\#179](https://github.com/mojotech/torch/pull/179) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 
 ## [v3.4.1](https://github.com/mojotech/torch/tree/v3.4.1) (2020-06-10)
 
@@ -118,8 +145,8 @@
 **Merged pull requests:**
 
 - Bump timex from 3.6.1 to 3.6.2 [\#167](https://github.com/mojotech/torch/pull/167) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump ex\_doc from 0.21.3 to 0.22.1 [\#166](https://github.com/mojotech/torch/pull/166) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump phoenix\_html from 2.13.3 to 2.13.4 [\#165](https://github.com/mojotech/torch/pull/165) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Bump ex_doc from 0.21.3 to 0.22.1 [\#166](https://github.com/mojotech/torch/pull/166) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Bump phoenix_html from 2.13.3 to 2.13.4 [\#165](https://github.com/mojotech/torch/pull/165) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 
 ## [v3.3.0](https://github.com/mojotech/torch/tree/v3.3.0) (2020-05-27)
 
@@ -131,7 +158,7 @@
 
 **Closed issues:**
 
-- Pagination error "paginate\_products/1 is undefined or private." [\#163](https://github.com/mojotech/torch/issues/163)
+- Pagination error "paginate_products/1 is undefined or private." [\#163](https://github.com/mojotech/torch/issues/163)
 
 **Merged pull requests:**
 
@@ -167,7 +194,7 @@
 
 **Closed issues:**
 
-- Can't run the server after installing  torch [\#146](https://github.com/mojotech/torch/issues/146)
+- Can't run the server after installing torch [\#146](https://github.com/mojotech/torch/issues/146)
 - Generate files into proper umbrella apps [\#83](https://github.com/mojotech/torch/issues/83)
 
 **Merged pull requests:**
@@ -176,7 +203,7 @@
 - Dont allow torch mix tasks from top-level of umbrella app [\#148](https://github.com/mojotech/torch/pull/148) ([cpjolicoeur](https://github.com/cpjolicoeur))
 - Bump credo from 1.1.5 to 1.3.2 [\#142](https://github.com/mojotech/torch/pull/142) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 - Bump excoveralls from 0.12.1 to 0.12.3 [\#141](https://github.com/mojotech/torch/pull/141) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump ex\_doc from 0.21.2 to 0.21.3 [\#132](https://github.com/mojotech/torch/pull/132) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Bump ex_doc from 0.21.2 to 0.21.3 [\#132](https://github.com/mojotech/torch/pull/132) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 - Bump gettext from 0.17.1 to 0.17.4 [\#128](https://github.com/mojotech/torch/pull/128) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 - Bump timex from 3.5.0 to 3.6.1 [\#118](https://github.com/mojotech/torch/pull/118) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 
@@ -211,9 +238,9 @@
 - Bump excoveralls from 0.11.2 to 0.12.1 [\#124](https://github.com/mojotech/torch/pull/124) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 - Bump gettext from 0.17.0 to 0.17.1 [\#123](https://github.com/mojotech/torch/pull/123) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 - Bump credo from 0.10.2 to 1.1.5 [\#121](https://github.com/mojotech/torch/pull/121) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump phoenix\_html from 2.13.1 to 2.13.3 [\#120](https://github.com/mojotech/torch/pull/120) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Bump phoenix_html from 2.13.1 to 2.13.3 [\#120](https://github.com/mojotech/torch/pull/120) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 - Bump gettext from 0.16.1 to 0.17.0 [\#117](https://github.com/mojotech/torch/pull/117) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
-- Bump ex\_doc from 0.19.3 to 0.21.2 [\#116](https://github.com/mojotech/torch/pull/116) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
+- Bump ex_doc from 0.19.3 to 0.21.2 [\#116](https://github.com/mojotech/torch/pull/116) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 - Bump excoveralls from 0.10.4 to 0.11.2 [\#114](https://github.com/mojotech/torch/pull/114) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 
 ## [v2.0.0](https://github.com/mojotech/torch/tree/v2.0.0) (2019-09-19)
@@ -258,13 +285,13 @@
 **Closed issues:**
 
 - Add I18N support [\#101](https://github.com/mojotech/torch/issues/101)
-- Filter by has\_one association field [\#96](https://github.com/mojotech/torch/issues/96)
+- Filter by has_one association field [\#96](https://github.com/mojotech/torch/issues/96)
 - License? [\#94](https://github.com/mojotech/torch/issues/94)
 - test integration with coherence [\#92](https://github.com/mojotech/torch/issues/92)
 - UndefinedFunctionError "module Routes is not available" [\#89](https://github.com/mojotech/torch/issues/89)
 - Improve documentation [\#86](https://github.com/mojotech/torch/issues/86)
 - Improve test coverage [\#85](https://github.com/mojotech/torch/issues/85)
-- Hex version not updated, 2.0.0-alpha fails.  [\#80](https://github.com/mojotech/torch/issues/80)
+- Hex version not updated, 2.0.0-alpha fails. [\#80](https://github.com/mojotech/torch/issues/80)
 - Update path's and configs to work with phoenix 1.3 [\#77](https://github.com/mojotech/torch/issues/77)
 - Properly disable form inputs [\#76](https://github.com/mojotech/torch/issues/76)
 - torch does not work with ecto \>= 2.2.0 [\#75](https://github.com/mojotech/torch/issues/75)
@@ -280,8 +307,8 @@
 - Fix disabled inputs and prep for 2.0.0-rc2 [\#108](https://github.com/mojotech/torch/pull/108) ([cpjolicoeur](https://github.com/cpjolicoeur))
 - Set active nav link based on link target, not text [\#106](https://github.com/mojotech/torch/pull/106) ([cpjolicoeur](https://github.com/cpjolicoeur))
 - Add I18N support. [\#102](https://github.com/mojotech/torch/pull/102) ([solov9ev](https://github.com/solov9ev))
-- Fix start\_page in pagination rendering [\#99](https://github.com/mojotech/torch/pull/99) ([akrisanov](https://github.com/akrisanov))
-- Adds custom has\_many filter association example to Readme [\#97](https://github.com/mojotech/torch/pull/97) ([zberkom](https://github.com/zberkom))
+- Fix start_page in pagination rendering [\#99](https://github.com/mojotech/torch/pull/99) ([akrisanov](https://github.com/akrisanov))
+- Adds custom has_many filter association example to Readme [\#97](https://github.com/mojotech/torch/pull/97) ([zberkom](https://github.com/zberkom))
 - Modernize Webpack [\#95](https://github.com/mojotech/torch/pull/95) ([danielberkompas](https://github.com/danielberkompas))
 - Install coveralls [\#88](https://github.com/mojotech/torch/pull/88) ([danielberkompas](https://github.com/danielberkompas))
 - \[\#85\] Improve tests [\#87](https://github.com/mojotech/torch/pull/87) ([danielberkompas](https://github.com/danielberkompas))
@@ -302,9 +329,9 @@
 
 **Closed issues:**
 
-- mix torch.install - Phoenix.HTML.Form.date\_input/3 conflicts with local function [\#81](https://github.com/mojotech/torch/issues/81)
+- mix torch.install - Phoenix.HTML.Form.date_input/3 conflicts with local function [\#81](https://github.com/mojotech/torch/issues/81)
 - Support Phoenix 1.3 [\#78](https://github.com/mojotech/torch/issues/78)
-- Docs incorrect regarding css setup.  [\#72](https://github.com/mojotech/torch/issues/72)
+- Docs incorrect regarding css setup. [\#72](https://github.com/mojotech/torch/issues/72)
 - last release Phoenix 1.3... throws error [\#70](https://github.com/mojotech/torch/issues/70)
 - Brunch not building correct JS imports [\#59](https://github.com/mojotech/torch/issues/59)
 
@@ -337,7 +364,7 @@
 **Closed issues:**
 
 - Example app post index controller error [\#47](https://github.com/mojotech/torch/issues/47)
-- ArgumentError with filter\_date\_input [\#42](https://github.com/mojotech/torch/issues/42)
+- ArgumentError with filter_date_input [\#42](https://github.com/mojotech/torch/issues/42)
 - Move example app into separate repo or subdirectory [\#24](https://github.com/mojotech/torch/issues/24)
 
 **Merged pull requests:**
@@ -447,6 +474,4 @@
 
 [Full Changelog](https://github.com/mojotech/torch/compare/0dbb20ebe44ecfe2796af1d54659c2424803790e...v0.1.0)
 
-
-
-\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
+\* _This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)_
diff --git a/assets/package-lock.json b/assets/package-lock.json
index 72bfe216..50baa989 100644
--- a/assets/package-lock.json
+++ b/assets/package-lock.json
@@ -4965,9 +4965,9 @@
       "dev": true
     },
     "path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
     "path-type": {
diff --git a/lib/mix/tasks/torch.gen.html.ex b/lib/mix/tasks/torch.gen.html.ex
index 532e2803..b50f2ff5 100644
--- a/lib/mix/tasks/torch.gen.html.ex
+++ b/lib/mix/tasks/torch.gen.html.ex
@@ -21,12 +21,22 @@ defmodule Mix.Tasks.Torch.Gen.Html do
 
     Mix.Torch.ensure_phoenix_is_loaded!("torch.gen.html")
 
+    phoenix_version = to_string(Application.spec(:phoenix, :vsn))
+
+    # Check for Phoenix 1.6+ with Phoenix.HTML 3+ and Heex
+    template_format =
+      cond do
+        format == "slime" -> format
+        Version.match?(phoenix_version, ">= 1.6.0-rc.0", allow_pre: true) -> "heex"
+        true -> "eex"
+      end
+
     # First, backup the projects existing templates if they exist
     Enum.each(@commands, &Mix.Torch.backup_project_templates/1)
 
     # Inject the torch templates for the generator into the priv/
     # directory so they will be picked up by the Phoenix generator
-    Enum.each(@commands, &Mix.Torch.inject_templates(&1, format))
+    Enum.each(@commands, &Mix.Torch.inject_templates(&1, template_format))
 
     # Run the Phoenix generator
     if format == "slime" do
diff --git a/lib/mix/torch.ex b/lib/mix/torch.ex
index 36be9265..a013c764 100644
--- a/lib/mix/torch.ex
+++ b/lib/mix/torch.ex
@@ -74,13 +74,21 @@ defmodule Mix.Torch do
   This is why this function invocation of `copy_from/2` changes the template file extensions
   to `.html.eex` reglardess of the original template format type.
   """
-  def inject_templates("phx.gen.html", format) do
+  def inject_templates("phx.gen.html", "heex") do
+    inject_templates("phx.gen.html", "heex", "heex")
+  end
+
+  def inject_templates("phx.gen.html", slime_or_eex) when is_binary(slime_or_eex) do
+    inject_templates("phx.gen.html", slime_or_eex, "eex")
+  end
+
+  def inject_templates("phx.gen.html", format, dest_format) do
     copy_from("priv/templates/#{format}/phx.gen.html", [
-      {"edit.html.#{format}", "priv/templates/phx.gen.html/edit.html.eex"},
-      {"form.html.#{format}", "priv/templates/phx.gen.html/form.html.eex"},
-      {"index.html.#{format}", "priv/templates/phx.gen.html/index.html.eex"},
-      {"new.html.#{format}", "priv/templates/phx.gen.html/new.html.eex"},
-      {"show.html.#{format}", "priv/templates/phx.gen.html/show.html.eex"}
+      {"edit.html.#{format}", "priv/templates/phx.gen.html/edit.html.#{dest_format}"},
+      {"form.html.#{format}", "priv/templates/phx.gen.html/form.html.#{dest_format}"},
+      {"index.html.#{format}", "priv/templates/phx.gen.html/index.html.#{dest_format}"},
+      {"new.html.#{format}", "priv/templates/phx.gen.html/new.html.#{dest_format}"},
+      {"show.html.#{format}", "priv/templates/phx.gen.html/show.html.#{dest_format}"}
     ])
 
     copy_from("priv/templates/common/phx.gen.html", [
diff --git a/mix.exs b/mix.exs
index ecd01486..09abafe4 100644
--- a/mix.exs
+++ b/mix.exs
@@ -2,7 +2,7 @@ defmodule Torch.MixProject do
   use Mix.Project
 
   @source_url "https://github.com/mojotech/torch"
-  @version "3.6.4"
+  @version "3.7.0"
 
   def project do
     [
@@ -43,8 +43,8 @@ defmodule Torch.MixProject do
   # Run "mix help deps" to learn about dependencies.
   defp deps do
     [
-      {:phoenix, ">= 1.3.0 and < 1.6.0"},
-      {:phoenix_html, "~> 2.10"},
+      {:phoenix, ">= 1.3.0 and < 1.7.0"},
+      {:phoenix_html, "~> 3.0"},
       {:gettext, "~> 0.16"},
       {:scrivener_ecto, ">= 1.2.1"},
       {:filtrex, "~> 0.4.1"},
diff --git a/mix.lock b/mix.lock
index 13560846..47b5f001 100644
--- a/mix.lock
+++ b/mix.lock
@@ -1,38 +1,38 @@
 %{
   "bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm", "7af5c7e09fe1d40f76c8e4f9dd2be7cebd83909f31fee7cd0e9eadc567da8353"},
-  "certifi": {:hex, :certifi, "2.6.1", "dbab8e5e155a0763eea978c913ca280a6b544bfa115633fa20249c3d396d9493", [:rebar3], [], "hexpm", "524c97b4991b3849dd5c17a631223896272c6b0af446778ba4675a1dff53bb7e"},
+  "certifi": {:hex, :certifi, "2.8.0", "d4fb0a6bb20b7c9c3643e22507e42f356ac090a1dcea9ab99e27e0376d695eba", [:rebar3], [], "hexpm", "6ac7efc1c6f8600b08d625292d4bbf584e14847ce1b6b5c44d983d273e1097ea"},
   "combine": {:hex, :combine, "0.10.0", "eff8224eeb56498a2af13011d142c5e7997a80c8f5b97c499f84c841032e429f", [:mix], [], "hexpm", "1b1dbc1790073076580d0d1d64e42eae2366583e7aecd455d1215b0d16f2451b"},
   "connection": {:hex, :connection, "1.0.4", "a1cae72211f0eef17705aaededacac3eb30e6625b04a6117c1b2db6ace7d5976", [:mix], [], "hexpm", "4a0850c9be22a43af9920a71ab17c051f5f7d45c209e40269a1938832510e4d9"},
   "credo": {:hex, :credo, "1.5.6", "e04cc0fdc236fefbb578e0c04bd01a471081616e741d386909e527ac146016c6", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2.8", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "4b52a3e558bd64e30de62a648518a5ea2b6e3e5d2b164ef5296244753fc7eb17"},
   "db_connection": {:hex, :db_connection, "2.0.5", "ddb2ba6761a08b2bb9ca0e7d260e8f4dd39067426d835c24491a321b7f92a4da", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, repo: "hexpm", optional: false]}], "hexpm", "ced0780bed50430f770b74fcde870c4a50c815124ecf9fee20d67a465966eb4f"},
   "decimal": {:hex, :decimal, "1.9.0", "83e8daf59631d632b171faabafb4a9f4242c514b0a06ba3df493951c08f64d07", [:mix], [], "hexpm", "b1f2343568eed6928f3e751cf2dffde95bfaa19dd95d09e8a9ea92ccfd6f7d85"},
   "earmark": {:hex, :earmark, "1.4.4", "4821b8d05cda507189d51f2caeef370cf1e18ca5d7dfb7d31e9cafe6688106a4", [:mix], [], "hexpm", "1f93aba7340574847c0f609da787f0d79efcab51b044bb6e242cae5aca9d264d"},
-  "earmark_parser": {:hex, :earmark_parser, "1.4.13", "0c98163e7d04a15feb62000e1a891489feb29f3d10cb57d4f845c405852bbef8", [:mix], [], "hexpm", "d602c26af3a0af43d2f2645613f65841657ad6efc9f0e361c3b6c06b578214ba"},
+  "earmark_parser": {:hex, :earmark_parser, "1.4.18", "e1b2be73eb08a49fb032a0208bf647380682374a725dfb5b9e510def8397f6f2", [:mix], [], "hexpm", "114a0e85ec3cf9e04b811009e73c206394ffecfcc313e0b346de0d557774ee97"},
   "ecto": {:hex, :ecto, "3.0.9", "f01922a0b91a41d764d4e3a914d7f058d99a03460d3082c61dd2dcadd724c934", [:mix], [{:decimal, "~> 1.6", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:poison, "~> 2.2 or ~> 3.0", [hex: :poison, repo: "hexpm", optional: true]}], "hexpm", "b5f2b45d3dc6ac4053cc96dec337dc4d28ba4e2d9ad905e2237553fde25d952f"},
   "ecto_sql": {:hex, :ecto_sql, "3.0.4", "e7a0feb0b2484b90981c56d5cd03c52122c1c31ded0b95ed213b7c5c07ae6737", [:mix], [{:db_connection, "~> 2.0", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.0.6", [hex: :ecto, repo: "hexpm", optional: false]}, {:mariaex, "~> 0.9.1", [hex: :mariaex, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.14.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.3.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7b49acc82d34fc1e020dbf8bebaff8f1dff40b550d778743943beba4190e4db5"},
-  "ex_doc": {:hex, :ex_doc, "0.25.0", "4070a254664ee5495c2f7cce87c2f43064a8752f7976f2de4937b65871b05223", [:mix], [{:earmark_parser, "~> 1.4.0", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "2d90883bd4f3d826af0bde7fea733a4c20adba1c79158e2330f7465821c8949b"},
+  "ex_doc": {:hex, :ex_doc, "0.26.0", "1922164bac0b18b02f84d6f69cab1b93bc3e870e2ad18d5dacb50a9e06b542a3", [:mix], [{:earmark_parser, "~> 1.4.0", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "2775d66e494a9a48355db7867478ffd997864c61c65a47d31c4949459281c78d"},
   "ex_unit_notifier": {:hex, :ex_unit_notifier, "1.2.0", "73ced2ecee0f2da0705e372c21ce61e4e5d927ddb797f73928e52818b9cc1754", [:mix], [], "hexpm", "f38044c9d50de68ad7f0aec4d781a10d9f1c92c62b36bf0227ec0aaa96aee332"},
-  "excoveralls": {:hex, :excoveralls, "0.14.2", "f9f5fd0004d7bbeaa28ea9606251bb643c313c3d60710bad1f5809c845b748f0", [:mix], [{:hackney, "~> 1.16", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "ca6fd358621cb4d29311b29d4732c4d47dac70e622850979bc54ed9a3e50f3e1"},
+  "excoveralls": {:hex, :excoveralls, "0.14.4", "295498f1ae47bdc6dce59af9a585c381e1aefc63298d48172efaaa90c3d251db", [:mix], [{:hackney, "~> 1.16", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "e3ab02f2df4c1c7a519728a6f0a747e71d7d6e846020aae338173619217931c1"},
   "file_system": {:hex, :file_system, "0.2.10", "fb082005a9cd1711c05b5248710f8826b02d7d1784e7c3451f9c1231d4fc162d", [:mix], [], "hexpm", "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"},
   "filtrex": {:hex, :filtrex, "0.4.3", "d59e496d385b19df7e3a613ad74deca4ac5ef1666352e9e435e8442fc9ae4c70", [:mix], [{:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:timex, "~> 3.1", [hex: :timex, repo: "hexpm", optional: false]}], "hexpm", "a374999d00174c3a6c617def9c9d199a2bc5928d49a227d1de622ccbadbff1d0"},
   "gettext": {:hex, :gettext, "0.18.2", "7df3ea191bb56c0309c00a783334b288d08a879f53a7014341284635850a6e55", [:mix], [], "hexpm", "f9f537b13d4fdd30f3039d33cb80144c3aa1f8d9698e47d7bcbcc8df93b1f5c5"},
-  "hackney": {:hex, :hackney, "1.17.4", "99da4674592504d3fb0cfef0db84c3ba02b4508bae2dff8c0108baa0d6e0977c", [:rebar3], [{:certifi, "~>2.6.1", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~>6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~>1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.3.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~>1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "de16ff4996556c8548d512f4dbe22dd58a587bf3332e7fd362430a7ef3986b16"},
+  "hackney": {:hex, :hackney, "1.18.0", "c4443d960bb9fba6d01161d01cd81173089686717d9490e5d3606644c48d121f", [:rebar3], [{:certifi, "~>2.8.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~>6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~>1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.3.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~>1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "9afcda620704d720db8c6a3123e9848d09c87586dc1c10479c42627b905b5c5e"},
   "idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"},
   "jason": {:hex, :jason, "1.2.2", "ba43e3f2709fd1aa1dce90aaabfd039d000469c05c56f0b8e31978e03fa39052", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "18a228f5f0058ee183f29f9eae0805c6e59d61c3b006760668d8d18ff0d12179"},
   "makeup": {:hex, :makeup, "1.0.5", "d5a830bc42c9800ce07dd97fa94669dfb93d3bf5fcf6ea7a0c67b2e0e4a7f26c", [:mix], [{:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "cfa158c02d3f5c0c665d0af11512fed3fba0144cf1aadee0f2ce17747fba2ca9"},
-  "makeup_elixir": {:hex, :makeup_elixir, "0.15.1", "b5888c880d17d1cc3e598f05cdb5b5a91b7b17ac4eaf5f297cb697663a1094dd", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.1", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "db68c173234b07ab2a07f645a5acdc117b9f99d69ebf521821d89690ae6c6ec8"},
+  "makeup_elixir": {:hex, :makeup_elixir, "0.15.2", "dc72dfe17eb240552857465cc00cce390960d9a0c055c4ccd38b70629227e97c", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.1", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "fd23ae48d09b32eff49d4ced2b43c9f086d402ee4fd4fcb2d7fad97fa8823e75"},
   "makeup_erlang": {:hex, :makeup_erlang, "0.1.1", "3fcb7f09eb9d98dc4d208f49cc955a34218fc41ff6b84df7c75b3e6e533cc65f", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "174d0809e98a4ef0b3309256cbf97101c6ec01c4ab0b23e926a9e17df2077cbb"},
   "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"},
-  "mime": {:hex, :mime, "1.3.1", "30ce04ab3175b6ad0bdce0035cba77bba68b813d523d1aac73d9781b4d193cf8", [:mix], [], "hexpm", "6cbe761d6a0ca5a31a0931bf4c63204bceb64538e664a8ecf784a9a6f3b875f1"},
+  "mime": {:hex, :mime, "1.6.0", "dabde576a497cef4bbdd60aceee8160e02a6c89250d6c0b29e56c0dfb00db3d2", [:mix], [], "hexpm", "31a1a8613f8321143dde1dafc36006a17d28d02bdfecb9e95a880fa7aabd19a7"},
   "mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm", "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"},
-  "mix_test_watch": {:hex, :mix_test_watch, "1.0.3", "63d5b21e9278abf519f359e6d59aed704ed3c72ec38be6ab22306ae5dc9a2e06", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}], "hexpm", "7352e91952d9748fb4f8aebe0a60357cdaf4bd6d6c42b5139c78fbcda6a0d7a2"},
-  "nimble_parsec": {:hex, :nimble_parsec, "1.1.0", "3a6fca1550363552e54c216debb6a9e95bd8d32348938e13de5eda962c0d7f89", [:mix], [], "hexpm", "08eb32d66b706e913ff748f11694b17981c0b04a33ef470e33e11b3d3ac8f54b"},
+  "mix_test_watch": {:hex, :mix_test_watch, "1.1.0", "330bb91c8ed271fe408c42d07e0773340a7938d8a0d281d57a14243eae9dc8c3", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}], "hexpm", "52b6b1c476cbb70fd899ca5394506482f12e5f6b0d6acff9df95c7f1e0812ec3"},
+  "nimble_parsec": {:hex, :nimble_parsec, "1.2.0", "b44d75e2a6542dcb6acf5d71c32c74ca88960421b6874777f79153bbbbd7dccc", [:mix], [], "hexpm", "52b2871a7515a5ac49b00f214e4165a40724cf99798d8e4a65e4fd64ebd002c1"},
   "parse_trans": {:hex, :parse_trans, "3.3.1", "16328ab840cc09919bd10dab29e431da3af9e9e7e7e6f0089dd5a2d2820011d8", [:rebar3], [], "hexpm", "07cd9577885f56362d414e8c4c4e6bdf10d43a8767abb92d24cbe8b24c54888b"},
   "phoenix": {:hex, :phoenix, "1.3.4", "aaa1b55e5523083a877bcbe9886d9ee180bf2c8754905323493c2ac325903dc5", [:mix], [{:cowboy, "~> 1.0", [hex: :cowboy, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 1.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.3.3 or ~> 1.4", [hex: :plug, repo: "hexpm", optional: false]}, {:poison, "~> 2.2 or ~> 3.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm", "f9eb4926aaad604c5ee4051f462f5981828fb559691236d71f7fb07ac4a0532d"},
-  "phoenix_html": {:hex, :phoenix_html, "2.13.4", "3df26e46642491114acfc5f249270d50972a7dffb66dd8a11a5bc94f1bcadaf8", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "f2959cb8278d5975b05211becde2520eec8a4c0d63ca6c039be6f2e34db78d81"},
+  "phoenix_html": {:hex, :phoenix_html, "3.0.3", "32812d70841c7e975e01edb591989b2b002b69797db1005b8d0adc1fe717be30", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "e8152ae9e8c60705659761edb8d8c4bb7e29130a9b0803ec1854fe137ec62dde"},
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "1.1.1", "6668d787e602981f24f17a5fbb69cc98f8ab085114ebfac6cc36e10a90c8e93c", [:mix], [], "hexpm", "a3d890aaa3156d51056179dcaaadaf32b844f71656bb27c58756f2b97875c36c"},
   "plug": {:hex, :plug, "1.7.2", "d7b7db7fbd755e8283b6c0a50be71ec0a3d67d9213d74422d9372effc8e87fd1", [:mix], [{:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}], "hexpm", "de9825f21c6fd6adfdeae8f9c80dcd88c1e58301f06bf13d659b7e606b88abe0"},
-  "plug_crypto": {:hex, :plug_crypto, "1.1.2", "bdd187572cc26dbd95b87136290425f2b580a116d3fb1f564216918c9730d227", [:mix], [], "hexpm", "6b8b608f895b6ffcfad49c37c7883e8df98ae19c6a28113b02aa1e9c5b22d6b5"},
+  "plug_crypto": {:hex, :plug_crypto, "1.2.2", "05654514ac717ff3a1843204b424477d9e60c143406aa94daf2274fdd280794d", [:mix], [], "hexpm", "87631c7ad914a5a445f0a3809f99b079113ae4ed4b867348dd9eec288cecb6db"},
   "poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], [], "hexpm", "fec8660eb7733ee4117b85f55799fd3833eb769a6df71ccf8903e8dc5447cfce"},
   "scrivener": {:hex, :scrivener, "2.7.0", "fa94cdea21fad0649921d8066b1833d18d296217bfdf4a5389a2f45ee857b773", [:mix], [], "hexpm", "30da36a427f2519cf75993271fb7c5aad1759682a70f90d880a85c3d743d2c57"},
   "scrivener_ecto": {:hex, :scrivener_ecto, "2.2.0", "53d5f1ba28f35f17891cf526ee102f8f225b7024d1cdaf8984875467158c9c5e", [:mix], [{:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:scrivener, "~> 2.4", [hex: :scrivener, repo: "hexpm", optional: false]}], "hexpm", "3eadfc0a762db4ba8acceee3450404f6ce5e710e52ccf04aae69fca5afe0cd2f"},
diff --git a/priv/templates/heex/phx.gen.html/edit.html.heex b/priv/templates/heex/phx.gen.html/edit.html.heex
new file mode 100644
index 00000000..00c9858c
--- /dev/null
+++ b/priv/templates/heex/phx.gen.html/edit.html.heex
@@ -0,0 +1,14 @@
+<section id="torch-toolbar">
+  <div class="torch-container">
+    <%%= link "Cancel", to: Routes.<%= schema.route_helper %>_path(@conn, :index), class: "torch-button" %>
+  </div>
+</section>
+
+<section id="torch-header-and-content">
+  <div class="torch-container">
+    <div class="header">
+      <h3>Edit <%= String.capitalize(schema.human_singular) %></h3>
+    </div>
+    <%%= render "form.html", Map.put(assigns, :action, Routes.<%= schema.route_helper %>_path(@conn, :update, @<%= schema.singular %>)) %>
+  </div>
+</section>
diff --git a/priv/templates/heex/phx.gen.html/form.html.heex b/priv/templates/heex/phx.gen.html/form.html.heex
new file mode 100644
index 00000000..5c26577d
--- /dev/null
+++ b/priv/templates/heex/phx.gen.html/form.html.heex
@@ -0,0 +1,20 @@
+<%%= form_for @changeset, @action, [multipart: true, id: "torch-form"], fn f -> %>
+  <fieldset class="torch-panel">
+    <legend>
+      <span>Details</span>
+    </legend>
+    <%%= if @changeset.action do %>
+      <p class="torch-form-error">Oops, something went wrong! Please check the errors below.</p>
+    <%% end %>
+  <%= for {label, input, error} <- inputs, input do %>
+    <div class="torch-form-group">
+      <%= label %>
+      <%= input %>
+      <%= error %>
+    </div>
+  <% end %>
+    <div class="torch-submit-form">
+      <%%= submit "Submit", class: "torch-submit-button" %>
+    </div>
+  </fieldset>
+<%% end %>
\ No newline at end of file
diff --git a/priv/templates/heex/phx.gen.html/index.html.heex b/priv/templates/heex/phx.gen.html/index.html.heex
new file mode 100644
index 00000000..f9a03b35
--- /dev/null
+++ b/priv/templates/heex/phx.gen.html/index.html.heex
@@ -0,0 +1,75 @@
+<section id="torch-toolbar">
+  <div class="torch-container">
+    <%%= link "New <%= schema.human_singular %>", to: Routes.<%= schema.route_helper %>_path(@conn, :new) %>
+  </div>
+</section>
+<section id="torch-index-content">
+  <div class="torch-container">
+    <section id="torch-filters">
+      <h3>Find <%= schema.human_plural %></h3>
+      <%%= form_tag @conn.request_path, method: :get, id: "torch-filters-form" do %>
+        <%= for {key, type} <- schema.attrs, type in [:string, :text] do %>
+          <div class="field">
+            <label><%= Phoenix.Naming.humanize(Atom.to_string(key)) %></label>
+            <%%= filter_select(:<%= schema.singular %>, :<%= key %>, @conn.params) %>
+            <%%= filter_<%= type %>_input(:<%= schema.singular %>, :<%= key %>, @conn.params) %>
+          </div>
+        <% end %>
+        <%= for {key, type} <- schema.attrs, type in [:boolean] do %>
+          <div class="field">
+            <label><%= Phoenix.Naming.humanize(Atom.to_string(key)) %></label>
+            <%%= filter_boolean_input(:<%= schema.singular %>, :<%= key %>, @conn.params) %>
+          </div>
+        <% end %>
+        <%= for {key, type} <- schema.attrs, type in [:date, :datetime, :utc_datetime, :naive_datetime] do %>
+          <div class="field">
+            <label><%= Phoenix.Naming.humanize(Atom.to_string(key)) %></label>
+            <%%= filter_date_input(:<%= schema.singular %>, :<%= key %>, @conn.params) %>
+          </div>
+        <% end %>
+        <%= for {key, type} <- schema.attrs, type in [:number, :integer] do %>
+          <div class="field">
+            <label><%= Phoenix.Naming.humanize(Atom.to_string(key)) %></label>
+            <%%= number_filter_select(:<%= schema.singular %>, :<%= key %>, @conn.params) %>
+            <%%= filter_number_input(:<%= schema.singular %>, :<%= key %>, @conn.params) %>
+          </div>
+        <% end %>
+        <button type="submit" class="torch-button">Search</button>
+        <%%= link "Clear Filters", to: Routes.<%= schema.route_helper %>_path(@conn, :index) %>
+      <%% end %>
+
+    </section>
+
+    <section id="torch-table">
+    <%%= if length(@<%= schema.plural %>) > 0 do %>
+      <table>
+        <thead>
+          <tr>
+            <%= for {k, _} <- schema.attrs do %>
+              <th><%%= table_link(@conn, "<%= Phoenix.Naming.humanize(Atom.to_string(k)) %>", <%= inspect(k) %>) %></th>
+            <% end %>
+            <th><span>Actions</span></th>
+          </tr>
+        </thead>
+        <tbody>
+          <%%= for <%= schema.singular %> <- @<%= schema.plural %> do %>
+            <tr>
+              <%= for {k, _} <- schema.attrs do %>
+                <td><%%= <%= schema.singular %>.<%= k %> %></td>
+              <% end %>
+              <td class="torch-actions">
+                <span><%%= link "Show", to: Routes.<%= schema.route_helper %>_path(@conn, :show, <%= schema.singular %>) %></span>
+                <span><%%= link "Edit", to: Routes.<%= schema.route_helper %>_path(@conn, :edit, <%= schema.singular %>) %></span>
+                <span><%%= link "Delete", to: Routes.<%= schema.route_helper %>_path(@conn, :delete, <%= schema.singular %>), method: :delete, data: [confirm: "Are you sure?"] %></span>
+              </td>
+            </tr>
+          <%% end %>
+        </tbody>
+      </table>
+      <%%= render Torch.PaginationView, "_pagination.html", assigns %>
+    <%% else %>
+      <p class="torch-no-data">No <%= schema.human_plural %> match your search.</p>
+    <%% end %>
+    </section>
+  </div>
+</section>
\ No newline at end of file
diff --git a/priv/templates/heex/phx.gen.html/new.html.heex b/priv/templates/heex/phx.gen.html/new.html.heex
new file mode 100644
index 00000000..ba456dec
--- /dev/null
+++ b/priv/templates/heex/phx.gen.html/new.html.heex
@@ -0,0 +1,14 @@
+<section id="torch-toolbar">
+  <div class="torch-container">
+    <%%= link "Cancel", to: Routes.<%= schema.route_helper %>_path(@conn, :index), class: "torch-button" %>
+  </div>
+</section>
+
+<section id="torch-header-and-content">
+  <div class="torch-container">
+    <div class="header">
+      <h3>New <%= String.capitalize(schema.human_singular) %></h3>
+    </div>
+    <%%= render "form.html", Map.put(assigns, :action, Routes.<%= schema.route_helper %>_path(@conn, :create)) %>
+  </div>
+</section>
\ No newline at end of file
diff --git a/priv/templates/heex/phx.gen.html/show.html.heex b/priv/templates/heex/phx.gen.html/show.html.heex
new file mode 100644
index 00000000..582ee56d
--- /dev/null
+++ b/priv/templates/heex/phx.gen.html/show.html.heex
@@ -0,0 +1,22 @@
+<section id="torch-toolbar">
+  <div class="torch-container">
+    <%%= link "Edit", to: Routes.<%= schema.route_helper %>_path(@conn, :edit, @<%= schema.singular %>), class: "torch-button" %>
+    <%%= link "Back", to: Routes.<%= schema.route_helper %>_path(@conn, :index), class: "torch-button" %>
+  </div>
+</section>
+
+<section id="torch-header-and-content">
+  <div class="torch-container">
+    <div class="header">
+      <h3><%= String.capitalize(schema.human_singular) %> Details</h3>
+    </div>
+    <ul>
+      <%= for {k, _} <- schema.attrs do %>
+        <li>
+          <div class="torch-show-label"><%= Phoenix.Naming.humanize(Atom.to_string(k)) %>:</div>
+          <div class="torch-show-data"><%%= @<%= schema.singular %>.<%= k %> %></div>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+</section>
\ No newline at end of file
diff --git a/priv/templates/phx.gen.context/access_no_schema.ex b/priv/templates/phx.gen.context/access_no_schema.ex
index 0e70cef2..d63b9e7d 100644
--- a/priv/templates/phx.gen.context/access_no_schema.ex
+++ b/priv/templates/phx.gen.context/access_no_schema.ex
@@ -13,8 +13,9 @@
 
   ## Examples
 
-      iex> list_<%= schema.plural %>(%{})
+      iex> paginate_<%= schema.plural %>(%{})
       %{<%= schema.plural %>: [%<%= inspect schema.alias %>{}], ...}
+
   """
   @spec paginate_<%= schema.plural %>(map) :: {:ok, map} | {:error, any}
   def paginate_<%= schema.plural %>(params \\ %{}) do
diff --git a/priv/templates/phx.gen.context/schema_access.ex b/priv/templates/phx.gen.context/schema_access.ex
index 163f588d..ba7c07c8 100644
--- a/priv/templates/phx.gen.context/schema_access.ex
+++ b/priv/templates/phx.gen.context/schema_access.ex
@@ -12,8 +12,9 @@ filters.
 
 ## Examples
 
-    iex> list_<%= schema.plural %>(%{})
+    iex> paginate_<%= schema.plural %>(%{})
     %{<%= schema.plural %>: [%<%= inspect schema.alias %>{}], ...}
+
 """
 @spec paginate_<%= schema.plural %>(map) :: {:ok, map} | {:error, any}
 def paginate_<%= schema.plural %>(params \\ %{}) do