diff --git a/.fontfoldercleanup/create_homebrew_formula.py b/.fontfoldercleanup/create_homebrew_formula.py
index daf6d22..5c95d45 100755
--- a/.fontfoldercleanup/create_homebrew_formula.py
+++ b/.fontfoldercleanup/create_homebrew_formula.py
@@ -20,9 +20,9 @@ class HomebrewCaskGenerator:
         ttf_dir = font_dir / "ttf"
         for f in sorted(ttf_dir.iterdir()):
             if f.is_file() and f.suffix.lower() in (".ttf", ".ttc"):
-                files.append(f"font_files/{font_name}/ttf/{f.name}")
+                files.append(f"homebrew-fonts/font_files/{font_name}/ttf/{f.name}")
         for otf in sorted((font_dir / "otf").glob("*.otf")):
-            files.append(f"font_files/{font_name}/otf/{otf.name}")
+            files.append(f"homebrew-fonts/font_files/{font_name}/otf/{otf.name}")
         return files
 
     def _collect_all_info(self, font_dir: Path) -> dict:
diff --git a/Casks/font-abbiescriptpro-rg.rb b/Casks/font-abbiescriptpro-rg.rb
index 0d10500..19b4848 100644
--- a/Casks/font-abbiescriptpro-rg.rb
+++ b/Casks/font-abbiescriptpro-rg.rb
@@ -10,6 +10,6 @@ cask "font-abbiescriptpro-rg" do
   name "Abbiescriptpro Rg"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-abbiescriptpro-rg/ttf/abbiescriptpro-rg.ttf"
-  font "font_files/font-abbiescriptpro-rg/otf/abbiescriptpro-rg.otf"
+  font "homebrew-fonts/font_files/font-abbiescriptpro-rg/ttf/abbiescriptpro-rg.ttf"
+  font "homebrew-fonts/font_files/font-abbiescriptpro-rg/otf/abbiescriptpro-rg.otf"
 end
diff --git a/Casks/font-acrylic-hand.rb b/Casks/font-acrylic-hand.rb
index 35789e7..f7e6290 100644
--- a/Casks/font-acrylic-hand.rb
+++ b/Casks/font-acrylic-hand.rb
@@ -10,5 +10,5 @@ cask "font-acrylic-hand" do
   name "Acrylic Hand"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-acrylic-hand/ttf/acylicalhand-thick.ttf"
+  font "homebrew-fonts/font_files/font-acrylic-hand/ttf/acylicalhand-thick.ttf"
 end
diff --git a/Casks/font-agpx.rb b/Casks/font-agpx.rb
index 5bb9040..39e5f3b 100644
--- a/Casks/font-agpx.rb
+++ b/Casks/font-agpx.rb
@@ -10,5 +10,5 @@ cask "font-agpx" do
   name "Agpx"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-agpx/otf/agpx.otf"
+  font "homebrew-fonts/font_files/font-agpx/otf/agpx.otf"
 end
diff --git a/Casks/font-airosol.rb b/Casks/font-airosol.rb
index 397886d..01b2357 100644
--- a/Casks/font-airosol.rb
+++ b/Casks/font-airosol.rb
@@ -10,5 +10,5 @@ cask "font-airosol" do
   name "Airosol"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-airosol/otf/airosol.otf"
+  font "homebrew-fonts/font_files/font-airosol/otf/airosol.otf"
 end
diff --git a/Casks/font-alphalyrae.rb b/Casks/font-alphalyrae.rb
index 458c909..7ff5934 100644
--- a/Casks/font-alphalyrae.rb
+++ b/Casks/font-alphalyrae.rb
@@ -10,5 +10,5 @@ cask "font-alphalyrae" do
   name "Alphalyrae"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-alphalyrae/otf/alphalyrae-medium.otf"
+  font "homebrew-fonts/font_files/font-alphalyrae/otf/alphalyrae-medium.otf"
 end
diff --git a/Casks/font-angular.rb b/Casks/font-angular.rb
index f106014..3d98446 100644
--- a/Casks/font-angular.rb
+++ b/Casks/font-angular.rb
@@ -10,5 +10,5 @@ cask "font-angular" do
   name "Angular"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-angular/otf/angular.otf"
+  font "homebrew-fonts/font_files/font-angular/otf/angular.otf"
 end
diff --git a/Casks/font-arinoe.rb b/Casks/font-arinoe.rb
index 4ab15d0..2bb4320 100644
--- a/Casks/font-arinoe.rb
+++ b/Casks/font-arinoe.rb
@@ -10,6 +10,6 @@ cask "font-arinoe" do
   name "Arinoe"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-arinoe/ttf/arinoe.ttf"
-  font "font_files/font-arinoe/otf/arinoe.otf"
+  font "homebrew-fonts/font_files/font-arinoe/ttf/arinoe.ttf"
+  font "homebrew-fonts/font_files/font-arinoe/otf/arinoe.otf"
 end
diff --git a/Casks/font-averasanstc.rb b/Casks/font-averasanstc.rb
index 04bef27..e439c68 100644
--- a/Casks/font-averasanstc.rb
+++ b/Casks/font-averasanstc.rb
@@ -10,9 +10,9 @@ cask "font-averasanstc" do
   name "Averasanstc"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-averasanstc/otf/averasanstc.otf"
-  font "font_files/font-averasanstc/otf/averasanstcbld.otf"
-  font "font_files/font-averasanstc/otf/averasanstcbrsh.otf"
-  font "font_files/font-averasanstc/otf/averasanstclt.otf"
-  font "font_files/font-averasanstc/otf/averasanstcsktch.otf"
+  font "homebrew-fonts/font_files/font-averasanstc/otf/averasanstc.otf"
+  font "homebrew-fonts/font_files/font-averasanstc/otf/averasanstcbld.otf"
+  font "homebrew-fonts/font_files/font-averasanstc/otf/averasanstcbrsh.otf"
+  font "homebrew-fonts/font_files/font-averasanstc/otf/averasanstclt.otf"
+  font "homebrew-fonts/font_files/font-averasanstc/otf/averasanstcsktch.otf"
 end
diff --git a/Casks/font-baduy.rb b/Casks/font-baduy.rb
index 4fa1bc9..882c5f3 100644
--- a/Casks/font-baduy.rb
+++ b/Casks/font-baduy.rb
@@ -10,6 +10,6 @@ cask "font-baduy" do
   name "Baduy"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-baduy/ttf/baduy.ttf"
-  font "font_files/font-baduy/otf/baduy.otf"
+  font "homebrew-fonts/font_files/font-baduy/ttf/baduy.ttf"
+  font "homebrew-fonts/font_files/font-baduy/otf/baduy.otf"
 end
diff --git a/Casks/font-bee-honey.rb b/Casks/font-bee-honey.rb
index 9c2ae61..f61bf55 100644
--- a/Casks/font-bee-honey.rb
+++ b/Casks/font-bee-honey.rb
@@ -10,6 +10,6 @@ cask "font-bee-honey" do
   name "Bee Honey"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-bee-honey/ttf/bee-honey-regular.ttf"
-  font "font_files/font-bee-honey/ttf/bee-honey-svg.ttf"
+  font "homebrew-fonts/font_files/font-bee-honey/ttf/bee-honey-regular.ttf"
+  font "homebrew-fonts/font_files/font-bee-honey/ttf/bee-honey-svg.ttf"
 end
diff --git a/Casks/font-benford.rb b/Casks/font-benford.rb
index d850d97..eb5bf94 100644
--- a/Casks/font-benford.rb
+++ b/Casks/font-benford.rb
@@ -10,6 +10,6 @@ cask "font-benford" do
   name "Benford"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-benford/ttf/benford-demo.ttf"
-  font "font_files/font-benford/otf/benford-demo.otf"
+  font "homebrew-fonts/font_files/font-benford/ttf/benford-demo.ttf"
+  font "homebrew-fonts/font_files/font-benford/otf/benford-demo.otf"
 end
diff --git a/Casks/font-bobby-jones-soft-free.rb b/Casks/font-bobby-jones-soft-free.rb
index fb4ded9..d1788d5 100644
--- a/Casks/font-bobby-jones-soft-free.rb
+++ b/Casks/font-bobby-jones-soft-free.rb
@@ -10,8 +10,8 @@ cask "font-bobby-jones-soft-free" do
   name "Bobby Jones Soft Free"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-bobby-jones-soft-free/ttf/bobby-rough-soft-outline.ttf"
-  font "font_files/font-bobby-jones-soft-free/ttf/bobby-rough-soft.ttf"
-  font "font_files/font-bobby-jones-soft-free/otf/bobby-jones-soft-outline.otf"
-  font "font_files/font-bobby-jones-soft-free/otf/bobby-jones-soft.otf"
+  font "homebrew-fonts/font_files/font-bobby-jones-soft-free/ttf/bobby-rough-soft-outline.ttf"
+  font "homebrew-fonts/font_files/font-bobby-jones-soft-free/ttf/bobby-rough-soft.ttf"
+  font "homebrew-fonts/font_files/font-bobby-jones-soft-free/otf/bobby-jones-soft-outline.otf"
+  font "homebrew-fonts/font_files/font-bobby-jones-soft-free/otf/bobby-jones-soft.otf"
 end
diff --git a/Casks/font-bouncy_castle_free.rb b/Casks/font-bouncy_castle_free.rb
index a4f8b60..93cfb3b 100644
--- a/Casks/font-bouncy_castle_free.rb
+++ b/Casks/font-bouncy_castle_free.rb
@@ -10,18 +10,18 @@ cask "font-bouncy_castle_free" do
   name "Bouncy Castle Free"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-bouncy_castle_free/ttf/bouncy-castle-bonus-bold.ttf"
-  font "font_files/font-bouncy_castle_free/ttf/bouncy-castle-bonus.ttf"
-  font "font_files/font-bouncy_castle_free/ttf/bouncy-castle-sans.ttf"
-  font "font_files/font-bouncy_castle_free/ttf/bouncy-castle-ss01.ttf"
-  font "font_files/font-bouncy_castle_free/ttf/bouncy-castle-ss02.ttf"
-  font "font_files/font-bouncy_castle_free/ttf/bouncy-castle-ss03.ttf"
-  font "font_files/font-bouncy_castle_free/ttf/bouncy-castle.ttf"
-  font "font_files/font-bouncy_castle_free/otf/bouncy-castle-bonus-bold.otf"
-  font "font_files/font-bouncy_castle_free/otf/bouncy-castle-bonus.otf"
-  font "font_files/font-bouncy_castle_free/otf/bouncy-castle-sans.otf"
-  font "font_files/font-bouncy_castle_free/otf/bouncy-castle-ss01.otf"
-  font "font_files/font-bouncy_castle_free/otf/bouncy-castle-ss02.otf"
-  font "font_files/font-bouncy_castle_free/otf/bouncy-castle-ss03.otf"
-  font "font_files/font-bouncy_castle_free/otf/bouncy-castle.otf"
+  font "homebrew-fonts/font_files/font-bouncy_castle_free/ttf/bouncy-castle-bonus-bold.ttf"
+  font "homebrew-fonts/font_files/font-bouncy_castle_free/ttf/bouncy-castle-bonus.ttf"
+  font "homebrew-fonts/font_files/font-bouncy_castle_free/ttf/bouncy-castle-sans.ttf"
+  font "homebrew-fonts/font_files/font-bouncy_castle_free/ttf/bouncy-castle-ss01.ttf"
+  font "homebrew-fonts/font_files/font-bouncy_castle_free/ttf/bouncy-castle-ss02.ttf"
+  font "homebrew-fonts/font_files/font-bouncy_castle_free/ttf/bouncy-castle-ss03.ttf"
+  font "homebrew-fonts/font_files/font-bouncy_castle_free/ttf/bouncy-castle.ttf"
+  font "homebrew-fonts/font_files/font-bouncy_castle_free/otf/bouncy-castle-bonus-bold.otf"
+  font "homebrew-fonts/font_files/font-bouncy_castle_free/otf/bouncy-castle-bonus.otf"
+  font "homebrew-fonts/font_files/font-bouncy_castle_free/otf/bouncy-castle-sans.otf"
+  font "homebrew-fonts/font_files/font-bouncy_castle_free/otf/bouncy-castle-ss01.otf"
+  font "homebrew-fonts/font_files/font-bouncy_castle_free/otf/bouncy-castle-ss02.otf"
+  font "homebrew-fonts/font_files/font-bouncy_castle_free/otf/bouncy-castle-ss03.otf"
+  font "homebrew-fonts/font_files/font-bouncy_castle_free/otf/bouncy-castle.otf"
 end
diff --git a/Casks/font-brightsight-02.rb b/Casks/font-brightsight-02.rb
index d7c6cfb..e892e2b 100644
--- a/Casks/font-brightsight-02.rb
+++ b/Casks/font-brightsight-02.rb
@@ -10,6 +10,6 @@ cask "font-brightsight-02" do
   name "Brightsight 02"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-brightsight-02/ttf/brightsight02.ttf"
-  font "font_files/font-brightsight-02/otf/brightsight02.otf"
+  font "homebrew-fonts/font_files/font-brightsight-02/ttf/brightsight02.ttf"
+  font "homebrew-fonts/font_files/font-brightsight-02/otf/brightsight02.otf"
 end
diff --git a/Casks/font-brixtonline.rb b/Casks/font-brixtonline.rb
index 1d9866a..33e3b5d 100644
--- a/Casks/font-brixtonline.rb
+++ b/Casks/font-brixtonline.rb
@@ -10,8 +10,8 @@ cask "font-brixtonline" do
   name "Brixtonline"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-brixtonline/ttf/brixtonln-lt.ttf"
-  font "font_files/font-brixtonline/ttf/brixtonln-rg.ttf"
-  font "font_files/font-brixtonline/otf/brixtonln-lt.otf"
-  font "font_files/font-brixtonline/otf/brixtonln-rg.otf"
+  font "homebrew-fonts/font_files/font-brixtonline/ttf/brixtonln-lt.ttf"
+  font "homebrew-fonts/font_files/font-brixtonline/ttf/brixtonln-rg.ttf"
+  font "homebrew-fonts/font_files/font-brixtonline/otf/brixtonln-lt.otf"
+  font "homebrew-fonts/font_files/font-brixtonline/otf/brixtonln-rg.otf"
 end
diff --git a/Casks/font-broke.rb b/Casks/font-broke.rb
index 02a3cec..ee24a18 100644
--- a/Casks/font-broke.rb
+++ b/Casks/font-broke.rb
@@ -10,9 +10,9 @@ cask "font-broke" do
   name "Broke"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-broke/otf/broke-bold.otf"
-  font "font_files/font-broke/otf/broke-medium.otf"
-  font "font_files/font-broke/otf/broke-regular.otf"
-  font "font_files/font-broke/otf/brokefat-black.otf"
-  font "font_files/font-broke/otf/brokefat-bold.otf"
+  font "homebrew-fonts/font_files/font-broke/otf/broke-bold.otf"
+  font "homebrew-fonts/font_files/font-broke/otf/broke-medium.otf"
+  font "homebrew-fonts/font_files/font-broke/otf/broke-regular.otf"
+  font "homebrew-fonts/font_files/font-broke/otf/brokefat-black.otf"
+  font "homebrew-fonts/font_files/font-broke/otf/brokefat-bold.otf"
 end
diff --git a/Casks/font-buffy.rb b/Casks/font-buffy.rb
index 16da895..103944d 100644
--- a/Casks/font-buffy.rb
+++ b/Casks/font-buffy.rb
@@ -10,6 +10,6 @@ cask "font-buffy" do
   name "Buffy"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-buffy/ttf/buffy.ttf"
-  font "font_files/font-buffy/otf/buffy.otf"
+  font "homebrew-fonts/font_files/font-buffy/ttf/buffy.ttf"
+  font "homebrew-fonts/font_files/font-buffy/otf/buffy.otf"
 end
diff --git a/Casks/font-cheeky-rabbit.rb b/Casks/font-cheeky-rabbit.rb
index 9d85c99..31cfd77 100644
--- a/Casks/font-cheeky-rabbit.rb
+++ b/Casks/font-cheeky-rabbit.rb
@@ -10,6 +10,6 @@ cask "font-cheeky-rabbit" do
   name "Cheeky Rabbit"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-cheeky-rabbit/ttf/cheeky-rabbit.ttf"
-  font "font_files/font-cheeky-rabbit/otf/cheekyrabbit.otf"
+  font "homebrew-fonts/font_files/font-cheeky-rabbit/ttf/cheeky-rabbit.ttf"
+  font "homebrew-fonts/font_files/font-cheeky-rabbit/otf/cheekyrabbit.otf"
 end
diff --git a/Casks/font-chido.rb b/Casks/font-chido.rb
index 5cbdd22..391eb47 100644
--- a/Casks/font-chido.rb
+++ b/Casks/font-chido.rb
@@ -10,5 +10,5 @@ cask "font-chido" do
   name "Chido"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-chido/otf/chido.otf"
+  font "homebrew-fonts/font_files/font-chido/otf/chido.otf"
 end
diff --git a/Casks/font-christmas-picture.rb b/Casks/font-christmas-picture.rb
index 15a9b70..f1e639c 100644
--- a/Casks/font-christmas-picture.rb
+++ b/Casks/font-christmas-picture.rb
@@ -10,6 +10,6 @@ cask "font-christmas-picture" do
   name "Christmas Picture"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-christmas-picture/ttf/christmas-picture.ttf"
-  font "font_files/font-christmas-picture/otf/christmas-picture.otf"
+  font "homebrew-fonts/font_files/font-christmas-picture/ttf/christmas-picture.ttf"
+  font "homebrew-fonts/font_files/font-christmas-picture/otf/christmas-picture.otf"
 end
diff --git a/Casks/font-chrone.rb b/Casks/font-chrone.rb
index 7badd7c..03d843e 100644
--- a/Casks/font-chrone.rb
+++ b/Casks/font-chrone.rb
@@ -10,6 +10,6 @@ cask "font-chrone" do
   name "Chrone"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-chrone/ttf/chrone-demo.ttf"
-  font "font_files/font-chrone/otf/chrone-demo.otf"
+  font "homebrew-fonts/font_files/font-chrone/ttf/chrone-demo.ttf"
+  font "homebrew-fonts/font_files/font-chrone/otf/chrone-demo.otf"
 end
diff --git a/Casks/font-clancy-experience.rb b/Casks/font-clancy-experience.rb
index 584abdf..a7d2958 100644
--- a/Casks/font-clancy-experience.rb
+++ b/Casks/font-clancy-experience.rb
@@ -10,5 +10,5 @@ cask "font-clancy-experience" do
   name "Clancy Experience"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-clancy-experience/otf/clancy-experience.otf"
+  font "homebrew-fonts/font_files/font-clancy-experience/otf/clancy-experience.otf"
 end
diff --git a/Casks/font-clancy.rb b/Casks/font-clancy.rb
index d4a31c6..9db9e26 100644
--- a/Casks/font-clancy.rb
+++ b/Casks/font-clancy.rb
@@ -10,6 +10,6 @@ cask "font-clancy" do
   name "Clancy"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-clancy/otf/_clancy-free.otf"
-  font "font_files/font-clancy/otf/clancy-free.otf"
+  font "homebrew-fonts/font_files/font-clancy/otf/_clancy-free.otf"
+  font "homebrew-fonts/font_files/font-clancy/otf/clancy-free.otf"
 end
diff --git a/Casks/font-code.rb b/Casks/font-code.rb
index bf7c4f6..c19e4c7 100644
--- a/Casks/font-code.rb
+++ b/Casks/font-code.rb
@@ -10,6 +10,6 @@ cask "font-code" do
   name "Code"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-code/otf/code-bold.otf"
-  font "font_files/font-code/otf/code-light.otf"
+  font "homebrew-fonts/font_files/font-code/otf/code-bold.otf"
+  font "homebrew-fonts/font_files/font-code/otf/code-light.otf"
 end
diff --git a/Casks/font-coffina.rb b/Casks/font-coffina.rb
index 0794a3c..4b120bb 100644
--- a/Casks/font-coffina.rb
+++ b/Casks/font-coffina.rb
@@ -10,6 +10,6 @@ cask "font-coffina" do
   name "Coffina"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-coffina/ttf/coffina.ttf"
-  font "font_files/font-coffina/otf/coffina.otf"
+  font "homebrew-fonts/font_files/font-coffina/ttf/coffina.ttf"
+  font "homebrew-fonts/font_files/font-coffina/otf/coffina.otf"
 end
diff --git a/Casks/font-copixel-font-1764372079-0.rb b/Casks/font-copixel-font-1764372079-0.rb
index 5c3ca92..9f02fae 100644
--- a/Casks/font-copixel-font-1764372079-0.rb
+++ b/Casks/font-copixel-font-1764372079-0.rb
@@ -10,5 +10,5 @@ cask "font-copixel-font-1764372079-0" do
   name "Copixel Font 1764372079 0"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-copixel-font-1764372079-0/otf/Copixel-Demo-BF6873ccc4785f8.otf"
+  font "homebrew-fonts/font_files/font-copixel-font-1764372079-0/otf/Copixel-Demo-BF6873ccc4785f8.otf"
 end
diff --git a/Casks/font-creamy-dreams.rb b/Casks/font-creamy-dreams.rb
index 19c73c4..7af5c2c 100644
--- a/Casks/font-creamy-dreams.rb
+++ b/Casks/font-creamy-dreams.rb
@@ -10,5 +10,5 @@ cask "font-creamy-dreams" do
   name "Creamy Dreams"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-creamy-dreams/otf/creamy-dreams.otf"
+  font "homebrew-fonts/font_files/font-creamy-dreams/otf/creamy-dreams.otf"
 end
diff --git a/Casks/font-cucurucho.rb b/Casks/font-cucurucho.rb
index 53870be..0065050 100644
--- a/Casks/font-cucurucho.rb
+++ b/Casks/font-cucurucho.rb
@@ -10,5 +10,5 @@ cask "font-cucurucho" do
   name "Cucurucho"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-cucurucho/otf/cucurucho.otf"
+  font "homebrew-fonts/font_files/font-cucurucho/otf/cucurucho.otf"
 end
diff --git a/Casks/font-damn.rb b/Casks/font-damn.rb
index 9e05edc..639c01d 100644
--- a/Casks/font-damn.rb
+++ b/Casks/font-damn.rb
@@ -10,6 +10,6 @@ cask "font-damn" do
   name "Damn"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-damn/ttf/damn.ttf"
-  font "font_files/font-damn/otf/damn.otf"
+  font "homebrew-fonts/font_files/font-damn/ttf/damn.ttf"
+  font "homebrew-fonts/font_files/font-damn/otf/damn.otf"
 end
diff --git a/Casks/font-dance-blues.rb b/Casks/font-dance-blues.rb
index dffa5ae..a364e6c 100644
--- a/Casks/font-dance-blues.rb
+++ b/Casks/font-dance-blues.rb
@@ -10,6 +10,6 @@ cask "font-dance-blues" do
   name "Dance Blues"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-dance-blues/ttf/dance-blues.ttf"
-  font "font_files/font-dance-blues/otf/dance-blues.otf"
+  font "homebrew-fonts/font_files/font-dance-blues/ttf/dance-blues.ttf"
+  font "homebrew-fonts/font_files/font-dance-blues/otf/dance-blues.otf"
 end
diff --git a/Casks/font-depixel.rb b/Casks/font-depixel.rb
index d0f3cee..262e72f 100644
--- a/Casks/font-depixel.rb
+++ b/Casks/font-depixel.rb
@@ -10,16 +10,16 @@ cask "font-depixel" do
   name "Depixel"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-depixel/ttf/depixelbreit-webfont.ttf"
-  font "font_files/font-depixel/ttf/depixelbreitfett-webfont.ttf"
-  font "font_files/font-depixel/ttf/depixelhalbfett-webfont.ttf"
-  font "font_files/font-depixel/ttf/depixelillegible-webfont.ttf"
-  font "font_files/font-depixel/ttf/depixelklein-webfont.ttf"
-  font "font_files/font-depixel/ttf/depixelschmal-webfont.ttf"
-  font "font_files/font-depixel/otf/depixelbreit.otf"
-  font "font_files/font-depixel/otf/depixelbreitfett.otf"
-  font "font_files/font-depixel/otf/depixelhalbfett.otf"
-  font "font_files/font-depixel/otf/depixelillegible.otf"
-  font "font_files/font-depixel/otf/depixelklein.otf"
-  font "font_files/font-depixel/otf/depixelschmal.otf"
+  font "homebrew-fonts/font_files/font-depixel/ttf/depixelbreit-webfont.ttf"
+  font "homebrew-fonts/font_files/font-depixel/ttf/depixelbreitfett-webfont.ttf"
+  font "homebrew-fonts/font_files/font-depixel/ttf/depixelhalbfett-webfont.ttf"
+  font "homebrew-fonts/font_files/font-depixel/ttf/depixelillegible-webfont.ttf"
+  font "homebrew-fonts/font_files/font-depixel/ttf/depixelklein-webfont.ttf"
+  font "homebrew-fonts/font_files/font-depixel/ttf/depixelschmal-webfont.ttf"
+  font "homebrew-fonts/font_files/font-depixel/otf/depixelbreit.otf"
+  font "homebrew-fonts/font_files/font-depixel/otf/depixelbreitfett.otf"
+  font "homebrew-fonts/font_files/font-depixel/otf/depixelhalbfett.otf"
+  font "homebrew-fonts/font_files/font-depixel/otf/depixelillegible.otf"
+  font "homebrew-fonts/font_files/font-depixel/otf/depixelklein.otf"
+  font "homebrew-fonts/font_files/font-depixel/otf/depixelschmal.otf"
 end
diff --git a/Casks/font-depok-cubism.rb b/Casks/font-depok-cubism.rb
index 903e69a..b3af3b3 100644
--- a/Casks/font-depok-cubism.rb
+++ b/Casks/font-depok-cubism.rb
@@ -10,7 +10,7 @@ cask "font-depok-cubism" do
   name "Depok Cubism"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-depok-cubism/ttf/depok-cubism.ttf"
-  font "font_files/font-depok-cubism/otf/depok-cubism.otf"
-  font "font_files/font-depok-cubism/otf/kosmos.otf"
+  font "homebrew-fonts/font_files/font-depok-cubism/ttf/depok-cubism.ttf"
+  font "homebrew-fonts/font_files/font-depok-cubism/otf/depok-cubism.otf"
+  font "homebrew-fonts/font_files/font-depok-cubism/otf/kosmos.otf"
 end
diff --git a/Casks/font-devils-cut.rb b/Casks/font-devils-cut.rb
index 1fdafec..d0de9f9 100644
--- a/Casks/font-devils-cut.rb
+++ b/Casks/font-devils-cut.rb
@@ -10,5 +10,5 @@ cask "font-devils-cut" do
   name "Devils Cut"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-devils-cut/otf/devilscut-shadow-personaluseonly.otf"
+  font "homebrew-fonts/font_files/font-devils-cut/otf/devilscut-shadow-personaluseonly.otf"
 end
diff --git a/Casks/font-dirty-clouds.rb b/Casks/font-dirty-clouds.rb
index 2d9a908..2dc3696 100644
--- a/Casks/font-dirty-clouds.rb
+++ b/Casks/font-dirty-clouds.rb
@@ -10,5 +10,5 @@ cask "font-dirty-clouds" do
   name "Dirty Clouds"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-dirty-clouds/otf/dirty-clouds.otf"
+  font "homebrew-fonts/font_files/font-dirty-clouds/otf/dirty-clouds.otf"
 end
diff --git a/Casks/font-district.rb b/Casks/font-district.rb
index 89cf630..a63c96f 100644
--- a/Casks/font-district.rb
+++ b/Casks/font-district.rb
@@ -10,6 +10,6 @@ cask "font-district" do
   name "District"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-district/ttf/district.ttf"
-  font "font_files/font-district/otf/district-regular.otf"
+  font "homebrew-fonts/font_files/font-district/ttf/district.ttf"
+  font "homebrew-fonts/font_files/font-district/otf/district-regular.otf"
 end
diff --git a/Casks/font-dk-frozen-memory.rb b/Casks/font-dk-frozen-memory.rb
index 1d8dad6..bfc18ae 100644
--- a/Casks/font-dk-frozen-memory.rb
+++ b/Casks/font-dk-frozen-memory.rb
@@ -10,5 +10,5 @@ cask "font-dk-frozen-memory" do
   name "Dk Frozen Memory"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-dk-frozen-memory/otf/dk-frozen-memory.otf"
+  font "homebrew-fonts/font_files/font-dk-frozen-memory/otf/dk-frozen-memory.otf"
 end
diff --git a/Casks/font-domaine-display.rb b/Casks/font-domaine-display.rb
index 8e87938..71ccc0b 100644
--- a/Casks/font-domaine-display.rb
+++ b/Casks/font-domaine-display.rb
@@ -10,5 +10,5 @@ cask "font-domaine-display" do
   name "Domaine Display"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-domaine-display/otf/domaine-display-bold.otf"
+  font "homebrew-fonts/font_files/font-domaine-display/otf/domaine-display-bold.otf"
 end
diff --git a/Casks/font-dtmilagros.rb b/Casks/font-dtmilagros.rb
index 8ccf107..718c374 100644
--- a/Casks/font-dtmilagros.rb
+++ b/Casks/font-dtmilagros.rb
@@ -10,5 +10,5 @@ cask "font-dtmilagros" do
   name "Dtmilagros"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-dtmilagros/otf/dt-milagros.otf"
+  font "homebrew-fonts/font_files/font-dtmilagros/otf/dt-milagros.otf"
 end
diff --git a/Casks/font-ep-boxi.rb b/Casks/font-ep-boxi.rb
index 9604a9b..daa6930 100644
--- a/Casks/font-ep-boxi.rb
+++ b/Casks/font-ep-boxi.rb
@@ -10,8 +10,8 @@ cask "font-ep-boxi" do
   name "Ep Boxi"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-ep-boxi/otf/ep-boxi-bi.otf"
-  font "font_files/font-ep-boxi/otf/ep-boxi-black.otf"
-  font "font_files/font-ep-boxi/otf/ep-boxi-bold.otf"
-  font "font_files/font-ep-boxi/otf/ep-boxi.otf"
+  font "homebrew-fonts/font_files/font-ep-boxi/otf/ep-boxi-bi.otf"
+  font "homebrew-fonts/font_files/font-ep-boxi/otf/ep-boxi-black.otf"
+  font "homebrew-fonts/font_files/font-ep-boxi/otf/ep-boxi-bold.otf"
+  font "homebrew-fonts/font_files/font-ep-boxi/otf/ep-boxi.otf"
 end
diff --git a/Casks/font-f37-stout.rb b/Casks/font-f37-stout.rb
index 180d9c2..7fda964 100644
--- a/Casks/font-f37-stout.rb
+++ b/Casks/font-f37-stout.rb
@@ -10,5 +10,5 @@ cask "font-f37-stout" do
   name "F37 Stout"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-f37-stout/ttf/f37stout-black.ttc"
+  font "homebrew-fonts/font_files/font-f37-stout/ttf/f37stout-black.ttc"
 end
diff --git a/Casks/font-flyover.rb b/Casks/font-flyover.rb
index fa9530f..d105ab2 100644
--- a/Casks/font-flyover.rb
+++ b/Casks/font-flyover.rb
@@ -10,6 +10,6 @@ cask "font-flyover" do
   name "Flyover"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-flyover/ttf/flyover.ttf"
-  font "font_files/font-flyover/otf/flyover.otf"
+  font "homebrew-fonts/font_files/font-flyover/ttf/flyover.ttf"
+  font "homebrew-fonts/font_files/font-flyover/otf/flyover.otf"
 end
diff --git a/Casks/font-fresh-christmas-font-1764370888-0.rb b/Casks/font-fresh-christmas-font-1764370888-0.rb
index 81403d5..3790483 100644
--- a/Casks/font-fresh-christmas-font-1764370888-0.rb
+++ b/Casks/font-fresh-christmas-font-1764370888-0.rb
@@ -10,5 +10,5 @@ cask "font-fresh-christmas-font-1764370888-0" do
   name "Fresh Christmas Font 1764370888 0"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-fresh-christmas-font-1764370888-0/otf/Fresh-Christmas.otf"
+  font "homebrew-fonts/font_files/font-fresh-christmas-font-1764370888-0/otf/Fresh-Christmas.otf"
 end
diff --git a/Casks/font-friem.rb b/Casks/font-friem.rb
index 508aa6a..c5cf4ba 100644
--- a/Casks/font-friem.rb
+++ b/Casks/font-friem.rb
@@ -10,8 +10,8 @@ cask "font-friem" do
   name "Friem"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-friem/ttf/friem-regular.ttf"
-  font "font_files/font-friem/ttf/friem-texture.ttf"
-  font "font_files/font-friem/otf/friem-regular.otf"
-  font "font_files/font-friem/otf/friem-texture.otf"
+  font "homebrew-fonts/font_files/font-friem/ttf/friem-regular.ttf"
+  font "homebrew-fonts/font_files/font-friem/ttf/friem-texture.ttf"
+  font "homebrew-fonts/font_files/font-friem/otf/friem-regular.otf"
+  font "homebrew-fonts/font_files/font-friem/otf/friem-texture.otf"
 end
diff --git a/Casks/font-funky-round.rb b/Casks/font-funky-round.rb
index 8a66ad8..3c1aa44 100644
--- a/Casks/font-funky-round.rb
+++ b/Casks/font-funky-round.rb
@@ -10,6 +10,6 @@ cask "font-funky-round" do
   name "Funky Round"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-funky-round/otf/funkyround.otf"
-  font "font_files/font-funky-round/otf/funkyround_striped.otf"
+  font "homebrew-fonts/font_files/font-funky-round/otf/funkyround.otf"
+  font "homebrew-fonts/font_files/font-funky-round/otf/funkyround_striped.otf"
 end
diff --git a/Casks/font-futura-1986.rb b/Casks/font-futura-1986.rb
index 976c4a9..94a9e55 100644
--- a/Casks/font-futura-1986.rb
+++ b/Casks/font-futura-1986.rb
@@ -10,5 +10,5 @@ cask "font-futura-1986" do
   name "Futura 1986"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-futura-1986/otf/futura1986.otf"
+  font "homebrew-fonts/font_files/font-futura-1986/otf/futura1986.otf"
 end
diff --git a/Casks/font-galaxia.rb b/Casks/font-galaxia.rb
index 896f026..cda008a 100644
--- a/Casks/font-galaxia.rb
+++ b/Casks/font-galaxia.rb
@@ -10,5 +10,5 @@ cask "font-galaxia" do
   name "Galaxia"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-galaxia/otf/galaxia-personal-used-flava.otf"
+  font "homebrew-fonts/font_files/font-galaxia/otf/galaxia-personal-used-flava.otf"
 end
diff --git a/Casks/font-gilbert.rb b/Casks/font-gilbert.rb
index 5d113ff..dc545da 100644
--- a/Casks/font-gilbert.rb
+++ b/Casks/font-gilbert.rb
@@ -10,6 +10,6 @@ cask "font-gilbert" do
   name "Gilbert"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-gilbert/otf/gilbert-bold-preview5.otf"
-  font "font_files/font-gilbert/otf/gilbert-color-bold-preview5.otf"
+  font "homebrew-fonts/font_files/font-gilbert/otf/gilbert-bold-preview5.otf"
+  font "homebrew-fonts/font_files/font-gilbert/otf/gilbert-color-bold-preview5.otf"
 end
diff --git a/Casks/font-graham_hand.rb b/Casks/font-graham_hand.rb
index 674e0be..f4dfe53 100644
--- a/Casks/font-graham_hand.rb
+++ b/Casks/font-graham_hand.rb
@@ -10,6 +10,6 @@ cask "font-graham_hand" do
   name "Graham Hand"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-graham_hand/ttf/grahamhand.ttf"
-  font "font_files/font-graham_hand/otf/grahamhand.otf"
+  font "homebrew-fonts/font_files/font-graham_hand/ttf/grahamhand.ttf"
+  font "homebrew-fonts/font_files/font-graham_hand/otf/grahamhand.otf"
 end
diff --git a/Casks/font-gyanko.rb b/Casks/font-gyanko.rb
index 1671100..729ef9d 100644
--- a/Casks/font-gyanko.rb
+++ b/Casks/font-gyanko.rb
@@ -10,6 +10,6 @@ cask "font-gyanko" do
   name "Gyanko"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-gyanko/otf/gyanko-regular.otf"
-  font "font_files/font-gyanko/otf/gyanko-stencil.otf"
+  font "homebrew-fonts/font_files/font-gyanko/otf/gyanko-regular.otf"
+  font "homebrew-fonts/font_files/font-gyanko/otf/gyanko-stencil.otf"
 end
diff --git a/Casks/font-hectra.rb b/Casks/font-hectra.rb
index 3a92e6c..9af51b6 100644
--- a/Casks/font-hectra.rb
+++ b/Casks/font-hectra.rb
@@ -10,6 +10,6 @@ cask "font-hectra" do
   name "Hectra"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-hectra/otf/hectra-bold.otf"
-  font "font_files/font-hectra/otf/hectra-rg.otf"
+  font "homebrew-fonts/font_files/font-hectra/otf/hectra-bold.otf"
+  font "homebrew-fonts/font_files/font-hectra/otf/hectra-rg.otf"
 end
diff --git a/Casks/font-hello-headline.rb b/Casks/font-hello-headline.rb
index 0b9a024..01366d6 100644
--- a/Casks/font-hello-headline.rb
+++ b/Casks/font-hello-headline.rb
@@ -10,5 +10,5 @@ cask "font-hello-headline" do
   name "Hello Headline"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-hello-headline/otf/hello-headline.otf"
+  font "homebrew-fonts/font_files/font-hello-headline/otf/hello-headline.otf"
 end
diff --git a/Casks/font-horseland.rb b/Casks/font-horseland.rb
index 38fb7f0..739979f 100644
--- a/Casks/font-horseland.rb
+++ b/Casks/font-horseland.rb
@@ -10,5 +10,5 @@ cask "font-horseland" do
   name "Horseland"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-horseland/ttf/wtf-horseland-was-habib.ttf"
+  font "homebrew-fonts/font_files/font-horseland/ttf/wtf-horseland-was-habib.ttf"
 end
diff --git a/Casks/font-idgrotesk.rb b/Casks/font-idgrotesk.rb
index 0738b0d..91ef16d 100644
--- a/Casks/font-idgrotesk.rb
+++ b/Casks/font-idgrotesk.rb
@@ -10,60 +10,60 @@ cask "font-idgrotesk" do
   name "Idgrotesk"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-idgrotesk/ttf/_idgrotesktrial-bold.ttf"
-  font "font_files/font-idgrotesk/ttf/_idgrotesktrial-bolditalic.ttf"
-  font "font_files/font-idgrotesk/ttf/_idgrotesktrial-book.ttf"
-  font "font_files/font-idgrotesk/ttf/_idgrotesktrial-bookitalic.ttf"
-  font "font_files/font-idgrotesk/ttf/_idgrotesktrial-italic.ttf"
-  font "font_files/font-idgrotesk/ttf/_idgrotesktrial-light.ttf"
-  font "font_files/font-idgrotesk/ttf/_idgrotesktrial-lightitalic.ttf"
-  font "font_files/font-idgrotesk/ttf/_idgrotesktrial-medium.ttf"
-  font "font_files/font-idgrotesk/ttf/_idgrotesktrial-mediumitalic.ttf"
-  font "font_files/font-idgrotesk/ttf/_idgrotesktrial-regular.ttf"
-  font "font_files/font-idgrotesk/ttf/_idgrotesktrial-semibold.ttf"
-  font "font_files/font-idgrotesk/ttf/_idgrotesktrial-semibolditalic.ttf"
-  font "font_files/font-idgrotesk/ttf/_idgrotesktrial-thin.ttf"
-  font "font_files/font-idgrotesk/ttf/_idgrotesktrial-thinitalic.ttf"
-  font "font_files/font-idgrotesk/ttf/idgrotesktrial-bold.ttf"
-  font "font_files/font-idgrotesk/ttf/idgrotesktrial-bolditalic.ttf"
-  font "font_files/font-idgrotesk/ttf/idgrotesktrial-book.ttf"
-  font "font_files/font-idgrotesk/ttf/idgrotesktrial-bookitalic.ttf"
-  font "font_files/font-idgrotesk/ttf/idgrotesktrial-italic.ttf"
-  font "font_files/font-idgrotesk/ttf/idgrotesktrial-light.ttf"
-  font "font_files/font-idgrotesk/ttf/idgrotesktrial-lightitalic.ttf"
-  font "font_files/font-idgrotesk/ttf/idgrotesktrial-medium.ttf"
-  font "font_files/font-idgrotesk/ttf/idgrotesktrial-mediumitalic.ttf"
-  font "font_files/font-idgrotesk/ttf/idgrotesktrial-regular.ttf"
-  font "font_files/font-idgrotesk/ttf/idgrotesktrial-semibold.ttf"
-  font "font_files/font-idgrotesk/ttf/idgrotesktrial-semibolditalic.ttf"
-  font "font_files/font-idgrotesk/ttf/idgrotesktrial-thin.ttf"
-  font "font_files/font-idgrotesk/ttf/idgrotesktrial-thinitalic.ttf"
-  font "font_files/font-idgrotesk/otf/_idgrotesktrial-bold.otf"
-  font "font_files/font-idgrotesk/otf/_idgrotesktrial-bolditalic.otf"
-  font "font_files/font-idgrotesk/otf/_idgrotesktrial-book.otf"
-  font "font_files/font-idgrotesk/otf/_idgrotesktrial-bookitalic.otf"
-  font "font_files/font-idgrotesk/otf/_idgrotesktrial-italic.otf"
-  font "font_files/font-idgrotesk/otf/_idgrotesktrial-light.otf"
-  font "font_files/font-idgrotesk/otf/_idgrotesktrial-lightitalic.otf"
-  font "font_files/font-idgrotesk/otf/_idgrotesktrial-medium.otf"
-  font "font_files/font-idgrotesk/otf/_idgrotesktrial-mediumitalic.otf"
-  font "font_files/font-idgrotesk/otf/_idgrotesktrial-regular.otf"
-  font "font_files/font-idgrotesk/otf/_idgrotesktrial-semibold.otf"
-  font "font_files/font-idgrotesk/otf/_idgrotesktrial-semibolditalic.otf"
-  font "font_files/font-idgrotesk/otf/_idgrotesktrial-thin.otf"
-  font "font_files/font-idgrotesk/otf/_idgrotesktrial-thinitalic.otf"
-  font "font_files/font-idgrotesk/otf/idgrotesktrial-bold.otf"
-  font "font_files/font-idgrotesk/otf/idgrotesktrial-bolditalic.otf"
-  font "font_files/font-idgrotesk/otf/idgrotesktrial-book.otf"
-  font "font_files/font-idgrotesk/otf/idgrotesktrial-bookitalic.otf"
-  font "font_files/font-idgrotesk/otf/idgrotesktrial-italic.otf"
-  font "font_files/font-idgrotesk/otf/idgrotesktrial-light.otf"
-  font "font_files/font-idgrotesk/otf/idgrotesktrial-lightitalic.otf"
-  font "font_files/font-idgrotesk/otf/idgrotesktrial-medium.otf"
-  font "font_files/font-idgrotesk/otf/idgrotesktrial-mediumitalic.otf"
-  font "font_files/font-idgrotesk/otf/idgrotesktrial-regular.otf"
-  font "font_files/font-idgrotesk/otf/idgrotesktrial-semibold.otf"
-  font "font_files/font-idgrotesk/otf/idgrotesktrial-semibolditalic.otf"
-  font "font_files/font-idgrotesk/otf/idgrotesktrial-thin.otf"
-  font "font_files/font-idgrotesk/otf/idgrotesktrial-thinitalic.otf"
+  font "homebrew-fonts/font_files/font-idgrotesk/ttf/_idgrotesktrial-bold.ttf"
+  font "homebrew-fonts/font_files/font-idgrotesk/ttf/_idgrotesktrial-bolditalic.ttf"
+  font "homebrew-fonts/font_files/font-idgrotesk/ttf/_idgrotesktrial-book.ttf"
+  font "homebrew-fonts/font_files/font-idgrotesk/ttf/_idgrotesktrial-bookitalic.ttf"
+  font "homebrew-fonts/font_files/font-idgrotesk/ttf/_idgrotesktrial-italic.ttf"
+  font "homebrew-fonts/font_files/font-idgrotesk/ttf/_idgrotesktrial-light.ttf"
+  font "homebrew-fonts/font_files/font-idgrotesk/ttf/_idgrotesktrial-lightitalic.ttf"
+  font "homebrew-fonts/font_files/font-idgrotesk/ttf/_idgrotesktrial-medium.ttf"
+  font "homebrew-fonts/font_files/font-idgrotesk/ttf/_idgrotesktrial-mediumitalic.ttf"
+  font "homebrew-fonts/font_files/font-idgrotesk/ttf/_idgrotesktrial-regular.ttf"
+  font "homebrew-fonts/font_files/font-idgrotesk/ttf/_idgrotesktrial-semibold.ttf"
+  font "homebrew-fonts/font_files/font-idgrotesk/ttf/_idgrotesktrial-semibolditalic.ttf"
+  font "homebrew-fonts/font_files/font-idgrotesk/ttf/_idgrotesktrial-thin.ttf"
+  font "homebrew-fonts/font_files/font-idgrotesk/ttf/_idgrotesktrial-thinitalic.ttf"
+  font "homebrew-fonts/font_files/font-idgrotesk/ttf/idgrotesktrial-bold.ttf"
+  font "homebrew-fonts/font_files/font-idgrotesk/ttf/idgrotesktrial-bolditalic.ttf"
+  font "homebrew-fonts/font_files/font-idgrotesk/ttf/idgrotesktrial-book.ttf"
+  font "homebrew-fonts/font_files/font-idgrotesk/ttf/idgrotesktrial-bookitalic.ttf"
+  font "homebrew-fonts/font_files/font-idgrotesk/ttf/idgrotesktrial-italic.ttf"
+  font "homebrew-fonts/font_files/font-idgrotesk/ttf/idgrotesktrial-light.ttf"
+  font "homebrew-fonts/font_files/font-idgrotesk/ttf/idgrotesktrial-lightitalic.ttf"
+  font "homebrew-fonts/font_files/font-idgrotesk/ttf/idgrotesktrial-medium.ttf"
+  font "homebrew-fonts/font_files/font-idgrotesk/ttf/idgrotesktrial-mediumitalic.ttf"
+  font "homebrew-fonts/font_files/font-idgrotesk/ttf/idgrotesktrial-regular.ttf"
+  font "homebrew-fonts/font_files/font-idgrotesk/ttf/idgrotesktrial-semibold.ttf"
+  font "homebrew-fonts/font_files/font-idgrotesk/ttf/idgrotesktrial-semibolditalic.ttf"
+  font "homebrew-fonts/font_files/font-idgrotesk/ttf/idgrotesktrial-thin.ttf"
+  font "homebrew-fonts/font_files/font-idgrotesk/ttf/idgrotesktrial-thinitalic.ttf"
+  font "homebrew-fonts/font_files/font-idgrotesk/otf/_idgrotesktrial-bold.otf"
+  font "homebrew-fonts/font_files/font-idgrotesk/otf/_idgrotesktrial-bolditalic.otf"
+  font "homebrew-fonts/font_files/font-idgrotesk/otf/_idgrotesktrial-book.otf"
+  font "homebrew-fonts/font_files/font-idgrotesk/otf/_idgrotesktrial-bookitalic.otf"
+  font "homebrew-fonts/font_files/font-idgrotesk/otf/_idgrotesktrial-italic.otf"
+  font "homebrew-fonts/font_files/font-idgrotesk/otf/_idgrotesktrial-light.otf"
+  font "homebrew-fonts/font_files/font-idgrotesk/otf/_idgrotesktrial-lightitalic.otf"
+  font "homebrew-fonts/font_files/font-idgrotesk/otf/_idgrotesktrial-medium.otf"
+  font "homebrew-fonts/font_files/font-idgrotesk/otf/_idgrotesktrial-mediumitalic.otf"
+  font "homebrew-fonts/font_files/font-idgrotesk/otf/_idgrotesktrial-regular.otf"
+  font "homebrew-fonts/font_files/font-idgrotesk/otf/_idgrotesktrial-semibold.otf"
+  font "homebrew-fonts/font_files/font-idgrotesk/otf/_idgrotesktrial-semibolditalic.otf"
+  font "homebrew-fonts/font_files/font-idgrotesk/otf/_idgrotesktrial-thin.otf"
+  font "homebrew-fonts/font_files/font-idgrotesk/otf/_idgrotesktrial-thinitalic.otf"
+  font "homebrew-fonts/font_files/font-idgrotesk/otf/idgrotesktrial-bold.otf"
+  font "homebrew-fonts/font_files/font-idgrotesk/otf/idgrotesktrial-bolditalic.otf"
+  font "homebrew-fonts/font_files/font-idgrotesk/otf/idgrotesktrial-book.otf"
+  font "homebrew-fonts/font_files/font-idgrotesk/otf/idgrotesktrial-bookitalic.otf"
+  font "homebrew-fonts/font_files/font-idgrotesk/otf/idgrotesktrial-italic.otf"
+  font "homebrew-fonts/font_files/font-idgrotesk/otf/idgrotesktrial-light.otf"
+  font "homebrew-fonts/font_files/font-idgrotesk/otf/idgrotesktrial-lightitalic.otf"
+  font "homebrew-fonts/font_files/font-idgrotesk/otf/idgrotesktrial-medium.otf"
+  font "homebrew-fonts/font_files/font-idgrotesk/otf/idgrotesktrial-mediumitalic.otf"
+  font "homebrew-fonts/font_files/font-idgrotesk/otf/idgrotesktrial-regular.otf"
+  font "homebrew-fonts/font_files/font-idgrotesk/otf/idgrotesktrial-semibold.otf"
+  font "homebrew-fonts/font_files/font-idgrotesk/otf/idgrotesktrial-semibolditalic.otf"
+  font "homebrew-fonts/font_files/font-idgrotesk/otf/idgrotesktrial-thin.otf"
+  font "homebrew-fonts/font_files/font-idgrotesk/otf/idgrotesktrial-thinitalic.otf"
 end
diff --git a/Casks/font-introvert-font-2-1764371655-0.rb b/Casks/font-introvert-font-2-1764371655-0.rb
index 91e6044..40cedc5 100644
--- a/Casks/font-introvert-font-2-1764371655-0.rb
+++ b/Casks/font-introvert-font-2-1764371655-0.rb
@@ -10,5 +10,5 @@ cask "font-introvert-font-2-1764371655-0" do
   name "Introvert Font 2 1764371655 0"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-introvert-font-2-1764371655-0/otf/Introvert-BF691f1a5a2336d.otf"
+  font "homebrew-fonts/font_files/font-introvert-font-2-1764371655-0/otf/Introvert-BF691f1a5a2336d.otf"
 end
diff --git a/Casks/font-jimmy-sans.rb b/Casks/font-jimmy-sans.rb
index 016cd7b..8c686a6 100644
--- a/Casks/font-jimmy-sans.rb
+++ b/Casks/font-jimmy-sans.rb
@@ -10,6 +10,6 @@ cask "font-jimmy-sans" do
   name "Jimmy Sans"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-jimmy-sans/otf/jimmysans-brush.otf"
-  font "font_files/font-jimmy-sans/otf/jimmysans-rg.otf"
+  font "homebrew-fonts/font_files/font-jimmy-sans/otf/jimmysans-brush.otf"
+  font "homebrew-fonts/font_files/font-jimmy-sans/otf/jimmysans-rg.otf"
 end
diff --git a/Casks/font-joc.rb b/Casks/font-joc.rb
index d92998a..64931b1 100644
--- a/Casks/font-joc.rb
+++ b/Casks/font-joc.rb
@@ -10,6 +10,6 @@ cask "font-joc" do
   name "Joc"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-joc/otf/joc-fill.otf"
-  font "font_files/font-joc/otf/joc-line.otf"
+  font "homebrew-fonts/font_files/font-joc/otf/joc-fill.otf"
+  font "homebrew-fonts/font_files/font-joc/otf/joc-line.otf"
 end
diff --git a/Casks/font-kompeni.rb b/Casks/font-kompeni.rb
index 78a3841..8bdff98 100644
--- a/Casks/font-kompeni.rb
+++ b/Casks/font-kompeni.rb
@@ -10,5 +10,5 @@ cask "font-kompeni" do
   name "Kompeni"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-kompeni/ttf/kompeni-regular.ttf"
+  font "homebrew-fonts/font_files/font-kompeni/ttf/kompeni-regular.ttf"
 end
diff --git a/Casks/font-lab-grotesk.rb b/Casks/font-lab-grotesk.rb
index 03367bd..cf01b61 100644
--- a/Casks/font-lab-grotesk.rb
+++ b/Casks/font-lab-grotesk.rb
@@ -10,5 +10,5 @@ cask "font-lab-grotesk" do
   name "Lab Grotesk"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-lab-grotesk/otf/lab-grotesk.otf"
+  font "homebrew-fonts/font_files/font-lab-grotesk/otf/lab-grotesk.otf"
 end
diff --git a/Casks/font-lance-tomchalky.rb b/Casks/font-lance-tomchalky.rb
index 502c1f2..1301c3f 100644
--- a/Casks/font-lance-tomchalky.rb
+++ b/Casks/font-lance-tomchalky.rb
@@ -10,8 +10,8 @@ cask "font-lance-tomchalky" do
   name "Lance Tomchalky"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-lance-tomchalky/ttf/lancerg.ttf"
-  font "font_files/font-lance-tomchalky/ttf/lancesansrg.ttf"
-  font "font_files/font-lance-tomchalky/otf/lancerg.otf"
-  font "font_files/font-lance-tomchalky/otf/lancesansrg.otf"
+  font "homebrew-fonts/font_files/font-lance-tomchalky/ttf/lancerg.ttf"
+  font "homebrew-fonts/font_files/font-lance-tomchalky/ttf/lancesansrg.ttf"
+  font "homebrew-fonts/font_files/font-lance-tomchalky/otf/lancerg.otf"
+  font "homebrew-fonts/font_files/font-lance-tomchalky/otf/lancesansrg.otf"
 end
diff --git a/Casks/font-latcha.rb b/Casks/font-latcha.rb
index c4b90e4..63224aa 100644
--- a/Casks/font-latcha.rb
+++ b/Casks/font-latcha.rb
@@ -10,5 +10,5 @@ cask "font-latcha" do
   name "Latcha"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-latcha/otf/latcha-personaluseonly.otf"
+  font "homebrew-fonts/font_files/font-latcha/otf/latcha-personaluseonly.otf"
 end
diff --git a/Casks/font-lazare-grotesk-font-family-1764370398-0.rb b/Casks/font-lazare-grotesk-font-family-1764370398-0.rb
index 7b32b90..450d1ed 100644
--- a/Casks/font-lazare-grotesk-font-family-1764370398-0.rb
+++ b/Casks/font-lazare-grotesk-font-family-1764370398-0.rb
@@ -10,25 +10,25 @@ cask "font-lazare-grotesk-font-family-1764370398-0" do
   name "Lazare Grotesk Font Family 1764370398 0"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-Black-BF647806db20415.otf"
-  font "font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-BlackBack-BF647806dbb006f.otf"
-  font "font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-BlackItalic-BF647806dbe2cde.otf"
-  font "font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-Bold-BF647806db04a12.otf"
-  font "font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-BoldBack-BF647806dbbac82.otf"
-  font "font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-BoldItalic-BF647806dbbf597.otf"
-  font "font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-Light-BF647806db1a1e7.otf"
-  font "font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-LightBack-BF647806dbc68ff.otf"
-  font "font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-LightItalic-BF647806dbc7770.otf"
-  font "font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-Medium-BF647806db24482.otf"
-  font "font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-MediumBack-BF647806db9228d.otf"
-  font "font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-MediumItalic-BF647806dc09b7e.otf"
-  font "font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-Regular-BF647806db2b1eb.otf"
-  font "font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-RegularBack-BF647806dba9aa2.otf"
-  font "font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-RegularItalic-BF647806dc0245f.otf"
-  font "font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-Thin-BF647806dbadb5b.otf"
-  font "font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-ThinBack-BF647806dbcc22e.otf"
-  font "font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-ThinItalic-BF647806dbe4f58.otf"
-  font "font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-UltraThin-BF647806dbbdb3a.otf"
-  font "font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-UltraThinBack-BF647806db89f02.otf"
-  font "font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-UltraThinItalic-BF647806dbf0c32.otf"
+  font "homebrew-fonts/font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-Black-BF647806db20415.otf"
+  font "homebrew-fonts/font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-BlackBack-BF647806dbb006f.otf"
+  font "homebrew-fonts/font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-BlackItalic-BF647806dbe2cde.otf"
+  font "homebrew-fonts/font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-Bold-BF647806db04a12.otf"
+  font "homebrew-fonts/font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-BoldBack-BF647806dbbac82.otf"
+  font "homebrew-fonts/font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-BoldItalic-BF647806dbbf597.otf"
+  font "homebrew-fonts/font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-Light-BF647806db1a1e7.otf"
+  font "homebrew-fonts/font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-LightBack-BF647806dbc68ff.otf"
+  font "homebrew-fonts/font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-LightItalic-BF647806dbc7770.otf"
+  font "homebrew-fonts/font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-Medium-BF647806db24482.otf"
+  font "homebrew-fonts/font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-MediumBack-BF647806db9228d.otf"
+  font "homebrew-fonts/font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-MediumItalic-BF647806dc09b7e.otf"
+  font "homebrew-fonts/font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-Regular-BF647806db2b1eb.otf"
+  font "homebrew-fonts/font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-RegularBack-BF647806dba9aa2.otf"
+  font "homebrew-fonts/font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-RegularItalic-BF647806dc0245f.otf"
+  font "homebrew-fonts/font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-Thin-BF647806dbadb5b.otf"
+  font "homebrew-fonts/font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-ThinBack-BF647806dbcc22e.otf"
+  font "homebrew-fonts/font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-ThinItalic-BF647806dbe4f58.otf"
+  font "homebrew-fonts/font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-UltraThin-BF647806dbbdb3a.otf"
+  font "homebrew-fonts/font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-UltraThinBack-BF647806db89f02.otf"
+  font "homebrew-fonts/font_files/font-lazare-grotesk-font-family-1764370398-0/otf/LazareGroteskTrial-UltraThinItalic-BF647806dbf0c32.otf"
 end
diff --git a/Casks/font-lexa.rb b/Casks/font-lexa.rb
index b4282c9..6eaa02c 100644
--- a/Casks/font-lexa.rb
+++ b/Casks/font-lexa.rb
@@ -10,5 +10,5 @@ cask "font-lexa" do
   name "Lexa"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-lexa/otf/lexa.otf"
+  font "homebrew-fonts/font_files/font-lexa/otf/lexa.otf"
 end
diff --git a/Casks/font-made-carving.rb b/Casks/font-made-carving.rb
index 9aa47a5..b2eb534 100644
--- a/Casks/font-made-carving.rb
+++ b/Casks/font-made-carving.rb
@@ -10,20 +10,20 @@ cask "font-made-carving" do
   name "Made Carving"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-made-carving/otf/madecarvingoutlinepersonaluse-black.otf"
-  font "font_files/font-made-carving/otf/madecarvingoutlinepersonaluse-bold.otf"
-  font "font_files/font-made-carving/otf/madecarvingoutlinepersonaluse-extralight.otf"
-  font "font_files/font-made-carving/otf/madecarvingoutlinepersonaluse-light.otf"
-  font "font_files/font-made-carving/otf/madecarvingoutlinepersonaluse-medium.otf"
-  font "font_files/font-made-carving/otf/madecarvingoutlinepersonaluse-regular.otf"
-  font "font_files/font-made-carving/otf/madecarvingoutlinepersonaluse-semibold.otf"
-  font "font_files/font-made-carving/otf/madecarvingoutlinepersonaluse-thin.otf"
-  font "font_files/font-made-carving/otf/madecarvingpersonaluse-black.otf"
-  font "font_files/font-made-carving/otf/madecarvingpersonaluse-bold.otf"
-  font "font_files/font-made-carving/otf/madecarvingpersonaluse-extralight.otf"
-  font "font_files/font-made-carving/otf/madecarvingpersonaluse-light.otf"
-  font "font_files/font-made-carving/otf/madecarvingpersonaluse-medium.otf"
-  font "font_files/font-made-carving/otf/madecarvingpersonaluse-regular.otf"
-  font "font_files/font-made-carving/otf/madecarvingpersonaluse-semibold.otf"
-  font "font_files/font-made-carving/otf/madecarvingpersonaluse-thin.otf"
+  font "homebrew-fonts/font_files/font-made-carving/otf/madecarvingoutlinepersonaluse-black.otf"
+  font "homebrew-fonts/font_files/font-made-carving/otf/madecarvingoutlinepersonaluse-bold.otf"
+  font "homebrew-fonts/font_files/font-made-carving/otf/madecarvingoutlinepersonaluse-extralight.otf"
+  font "homebrew-fonts/font_files/font-made-carving/otf/madecarvingoutlinepersonaluse-light.otf"
+  font "homebrew-fonts/font_files/font-made-carving/otf/madecarvingoutlinepersonaluse-medium.otf"
+  font "homebrew-fonts/font_files/font-made-carving/otf/madecarvingoutlinepersonaluse-regular.otf"
+  font "homebrew-fonts/font_files/font-made-carving/otf/madecarvingoutlinepersonaluse-semibold.otf"
+  font "homebrew-fonts/font_files/font-made-carving/otf/madecarvingoutlinepersonaluse-thin.otf"
+  font "homebrew-fonts/font_files/font-made-carving/otf/madecarvingpersonaluse-black.otf"
+  font "homebrew-fonts/font_files/font-made-carving/otf/madecarvingpersonaluse-bold.otf"
+  font "homebrew-fonts/font_files/font-made-carving/otf/madecarvingpersonaluse-extralight.otf"
+  font "homebrew-fonts/font_files/font-made-carving/otf/madecarvingpersonaluse-light.otf"
+  font "homebrew-fonts/font_files/font-made-carving/otf/madecarvingpersonaluse-medium.otf"
+  font "homebrew-fonts/font_files/font-made-carving/otf/madecarvingpersonaluse-regular.otf"
+  font "homebrew-fonts/font_files/font-made-carving/otf/madecarvingpersonaluse-semibold.otf"
+  font "homebrew-fonts/font_files/font-made-carving/otf/madecarvingpersonaluse-thin.otf"
 end
diff --git a/Casks/font-made-infinity.rb b/Casks/font-made-infinity.rb
index 221328b..a6c8ce2 100644
--- a/Casks/font-made-infinity.rb
+++ b/Casks/font-made-infinity.rb
@@ -10,9 +10,9 @@ cask "font-made-infinity" do
   name "Made Infinity"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-made-infinity/otf/madeinfinity-personaluse-black.otf"
-  font "font_files/font-made-infinity/otf/madeinfinity-personaluse-light.otf"
-  font "font_files/font-made-infinity/otf/madeinfinity-personaluse-medium.otf"
-  font "font_files/font-made-infinity/otf/madeinfinity-personaluse-regular.otf"
-  font "font_files/font-made-infinity/otf/madeinfinity-personaluse-thin.otf"
+  font "homebrew-fonts/font_files/font-made-infinity/otf/madeinfinity-personaluse-black.otf"
+  font "homebrew-fonts/font_files/font-made-infinity/otf/madeinfinity-personaluse-light.otf"
+  font "homebrew-fonts/font_files/font-made-infinity/otf/madeinfinity-personaluse-medium.otf"
+  font "homebrew-fonts/font_files/font-made-infinity/otf/madeinfinity-personaluse-regular.otf"
+  font "homebrew-fonts/font_files/font-made-infinity/otf/madeinfinity-personaluse-thin.otf"
 end
diff --git a/Casks/font-magic-painted.rb b/Casks/font-magic-painted.rb
index dd3e550..4a98c67 100644
--- a/Casks/font-magic-painted.rb
+++ b/Casks/font-magic-painted.rb
@@ -10,5 +10,5 @@ cask "font-magic-painted" do
   name "Magic Painted"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-magic-painted/otf/magic-painted.otf"
+  font "homebrew-fonts/font_files/font-magic-painted/otf/magic-painted.otf"
 end
diff --git a/Casks/font-magnode.rb b/Casks/font-magnode.rb
index d8c4360..bc5d833 100644
--- a/Casks/font-magnode.rb
+++ b/Casks/font-magnode.rb
@@ -10,7 +10,7 @@ cask "font-magnode" do
   name "Magnode"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-magnode/ttf/magnode-trial-version.ttf"
-  font "font_files/font-magnode/otf/magnode-trial-version.otf"
-  font "font_files/font-magnode/otf/xkcd.otf"
+  font "homebrew-fonts/font_files/font-magnode/ttf/magnode-trial-version.ttf"
+  font "homebrew-fonts/font_files/font-magnode/otf/magnode-trial-version.otf"
+  font "homebrew-fonts/font_files/font-magnode/otf/xkcd.otf"
 end
diff --git a/Casks/font-marker_notes.rb b/Casks/font-marker_notes.rb
index 3d3c71b..ddd72b3 100644
--- a/Casks/font-marker_notes.rb
+++ b/Casks/font-marker_notes.rb
@@ -10,8 +10,8 @@ cask "font-marker_notes" do
   name "Marker Notes"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-marker_notes/ttf/marker-notes-italic.ttf"
-  font "font_files/font-marker_notes/ttf/marker-notes.ttf"
-  font "font_files/font-marker_notes/otf/marker-notes-italic.otf"
-  font "font_files/font-marker_notes/otf/marker-notes.otf"
+  font "homebrew-fonts/font_files/font-marker_notes/ttf/marker-notes-italic.ttf"
+  font "homebrew-fonts/font_files/font-marker_notes/ttf/marker-notes.ttf"
+  font "homebrew-fonts/font_files/font-marker_notes/otf/marker-notes-italic.otf"
+  font "homebrew-fonts/font_files/font-marker_notes/otf/marker-notes.otf"
 end
diff --git a/Casks/font-marvelo.rb b/Casks/font-marvelo.rb
index ee9aad1..42f21f6 100644
--- a/Casks/font-marvelo.rb
+++ b/Casks/font-marvelo.rb
@@ -10,6 +10,6 @@ cask "font-marvelo" do
   name "Marvelo"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-marvelo/ttf/marvelo.ttf"
-  font "font_files/font-marvelo/otf/marvelo.otf"
+  font "homebrew-fonts/font_files/font-marvelo/ttf/marvelo.ttf"
+  font "homebrew-fonts/font_files/font-marvelo/otf/marvelo.otf"
 end
diff --git a/Casks/font-mba-slice-mono.rb b/Casks/font-mba-slice-mono.rb
index 428d9ba..94c9a21 100644
--- a/Casks/font-mba-slice-mono.rb
+++ b/Casks/font-mba-slice-mono.rb
@@ -10,5 +10,5 @@ cask "font-mba-slice-mono" do
   name "Mba Slice Mono"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-mba-slice-mono/otf/mbaslicemono-regular.otf"
+  font "homebrew-fonts/font_files/font-mba-slice-mono/otf/mbaslicemono-regular.otf"
 end
diff --git a/Casks/font-miracode.rb b/Casks/font-miracode.rb
index c4e2771..c15aa6c 100644
--- a/Casks/font-miracode.rb
+++ b/Casks/font-miracode.rb
@@ -10,5 +10,5 @@ cask "font-miracode" do
   name "Miracode"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-miracode/ttf/font.ttf"
+  font "homebrew-fonts/font_files/font-miracode/ttf/font.ttf"
 end
diff --git a/Casks/font-moon-walk.rb b/Casks/font-moon-walk.rb
index 395f10f..5fac649 100644
--- a/Casks/font-moon-walk.rb
+++ b/Casks/font-moon-walk.rb
@@ -10,6 +10,6 @@ cask "font-moon-walk" do
   name "Moon Walk"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-moon-walk/ttf/moon-walk.ttf"
-  font "font_files/font-moon-walk/otf/moon-walk.otf"
+  font "homebrew-fonts/font_files/font-moon-walk/ttf/moon-walk.ttf"
+  font "homebrew-fonts/font_files/font-moon-walk/otf/moon-walk.otf"
 end
diff --git a/Casks/font-morgon.rb b/Casks/font-morgon.rb
index 7a15e0f..6a804b5 100644
--- a/Casks/font-morgon.rb
+++ b/Casks/font-morgon.rb
@@ -10,5 +10,5 @@ cask "font-morgon" do
   name "Morgon"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-morgon/otf/morgon-personaluseonly.otf"
+  font "homebrew-fonts/font_files/font-morgon/otf/morgon-personaluseonly.otf"
 end
diff --git a/Casks/font-nafasmanual.rb b/Casks/font-nafasmanual.rb
index 8be23fc..5e47b28 100644
--- a/Casks/font-nafasmanual.rb
+++ b/Casks/font-nafasmanual.rb
@@ -10,8 +10,8 @@ cask "font-nafasmanual" do
   name "Nafasmanual"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-nafasmanual/ttf/nafasmanualregular.ttf"
-  font "font_files/font-nafasmanual/ttf/nafasmanualsliced.ttf"
-  font "font_files/font-nafasmanual/otf/nafasmanualregular.otf"
-  font "font_files/font-nafasmanual/otf/nafasmanualsliced.otf"
+  font "homebrew-fonts/font_files/font-nafasmanual/ttf/nafasmanualregular.ttf"
+  font "homebrew-fonts/font_files/font-nafasmanual/ttf/nafasmanualsliced.ttf"
+  font "homebrew-fonts/font_files/font-nafasmanual/otf/nafasmanualregular.otf"
+  font "homebrew-fonts/font_files/font-nafasmanual/otf/nafasmanualsliced.otf"
 end
diff --git a/Casks/font-neopixel-font-1764372129-0.rb b/Casks/font-neopixel-font-1764372129-0.rb
index 183a857..419db00 100644
--- a/Casks/font-neopixel-font-1764372129-0.rb
+++ b/Casks/font-neopixel-font-1764372129-0.rb
@@ -10,5 +10,5 @@ cask "font-neopixel-font-1764372129-0" do
   name "Neopixel Font 1764372129 0"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-neopixel-font-1764372129-0/otf/neopixel-regular.otf"
+  font "homebrew-fonts/font_files/font-neopixel-font-1764372129-0/otf/neopixel-regular.otf"
 end
diff --git a/Casks/font-new-kansas-black-wisabo.rb b/Casks/font-new-kansas-black-wisabo.rb
index 22cf75d..62ce611 100644
--- a/Casks/font-new-kansas-black-wisabo.rb
+++ b/Casks/font-new-kansas-black-wisabo.rb
@@ -10,13 +10,13 @@ cask "font-new-kansas-black-wisabo" do
   name "New Kansas Black Wisabo"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-new-kansas-black-wisabo/otf/fonnts.com-new-kansas-.otf"
-  font "font_files/font-new-kansas-black-wisabo/otf/fonnts.com-new-kansas-black.otf"
-  font "font_files/font-new-kansas-black-wisabo/otf/fonnts.com-new-kansas-bold.otf"
-  font "font_files/font-new-kansas-black-wisabo/otf/fonnts.com-new-kansas-heavy.otf"
-  font "font_files/font-new-kansas-black-wisabo/otf/fonnts.com-new-kansas-light.otf"
-  font "font_files/font-new-kansas-black-wisabo/otf/fonnts.com-new-kansas-medium.otf"
-  font "font_files/font-new-kansas-black-wisabo/otf/fonnts.com-new-kansas-semi-bold.otf"
-  font "font_files/font-new-kansas-black-wisabo/otf/fonnts.com-new-kansas-thin.otf"
-  font "font_files/font-new-kansas-black-wisabo/otf/new-kansas-black.otf"
+  font "homebrew-fonts/font_files/font-new-kansas-black-wisabo/otf/fonnts.com-new-kansas-.otf"
+  font "homebrew-fonts/font_files/font-new-kansas-black-wisabo/otf/fonnts.com-new-kansas-black.otf"
+  font "homebrew-fonts/font_files/font-new-kansas-black-wisabo/otf/fonnts.com-new-kansas-bold.otf"
+  font "homebrew-fonts/font_files/font-new-kansas-black-wisabo/otf/fonnts.com-new-kansas-heavy.otf"
+  font "homebrew-fonts/font_files/font-new-kansas-black-wisabo/otf/fonnts.com-new-kansas-light.otf"
+  font "homebrew-fonts/font_files/font-new-kansas-black-wisabo/otf/fonnts.com-new-kansas-medium.otf"
+  font "homebrew-fonts/font_files/font-new-kansas-black-wisabo/otf/fonnts.com-new-kansas-semi-bold.otf"
+  font "homebrew-fonts/font_files/font-new-kansas-black-wisabo/otf/fonnts.com-new-kansas-thin.otf"
+  font "homebrew-fonts/font_files/font-new-kansas-black-wisabo/otf/new-kansas-black.otf"
 end
diff --git a/Casks/font-nugia-vintage.rb b/Casks/font-nugia-vintage.rb
index 6702a37..e216314 100644
--- a/Casks/font-nugia-vintage.rb
+++ b/Casks/font-nugia-vintage.rb
@@ -10,6 +10,6 @@ cask "font-nugia-vintage" do
   name "Nugia Vintage"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-nugia-vintage/ttf/nugiavintage.ttf"
-  font "font_files/font-nugia-vintage/otf/nugiavintage.otf"
+  font "homebrew-fonts/font_files/font-nugia-vintage/ttf/nugiavintage.ttf"
+  font "homebrew-fonts/font_files/font-nugia-vintage/otf/nugiavintage.otf"
 end
diff --git a/Casks/font-overland.rb b/Casks/font-overland.rb
index b517d7e..4e314a2 100644
--- a/Casks/font-overland.rb
+++ b/Casks/font-overland.rb
@@ -10,6 +10,6 @@ cask "font-overland" do
   name "Overland"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-overland/otf/overland-regular.otf"
-  font "font_files/font-overland/otf/overland.otf"
+  font "homebrew-fonts/font_files/font-overland/otf/overland-regular.otf"
+  font "homebrew-fonts/font_files/font-overland/otf/overland.otf"
 end
diff --git a/Casks/font-parasite-game.rb b/Casks/font-parasite-game.rb
index f899d10..1682ac5 100644
--- a/Casks/font-parasite-game.rb
+++ b/Casks/font-parasite-game.rb
@@ -10,5 +10,5 @@ cask "font-parasite-game" do
   name "Parasite Game"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-parasite-game/ttf/parasite-game-personal-use.ttf"
+  font "homebrew-fonts/font_files/font-parasite-game/ttf/parasite-game-personal-use.ttf"
 end
diff --git a/Casks/font-patsy-sans-grotesque.rb b/Casks/font-patsy-sans-grotesque.rb
index bf60239..615b335 100644
--- a/Casks/font-patsy-sans-grotesque.rb
+++ b/Casks/font-patsy-sans-grotesque.rb
@@ -10,6 +10,6 @@ cask "font-patsy-sans-grotesque" do
   name "Patsy Sans Grotesque"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-patsy-sans-grotesque/otf/patsysans-italic.otf"
-  font "font_files/font-patsy-sans-grotesque/otf/patsysans.otf"
+  font "homebrew-fonts/font_files/font-patsy-sans-grotesque/otf/patsysans-italic.otf"
+  font "homebrew-fonts/font_files/font-patsy-sans-grotesque/otf/patsysans.otf"
 end
diff --git a/Casks/font-pixel-crash-font-1764372071-0.rb b/Casks/font-pixel-crash-font-1764372071-0.rb
index f432533..76aded4 100644
--- a/Casks/font-pixel-crash-font-1764372071-0.rb
+++ b/Casks/font-pixel-crash-font-1764372071-0.rb
@@ -10,5 +10,5 @@ cask "font-pixel-crash-font-1764372071-0" do
   name "Pixel Crash Font 1764372071 0"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-pixel-crash-font-1764372071-0/otf/pixelcrash-trial.otf"
+  font "homebrew-fonts/font_files/font-pixel-crash-font-1764372071-0/otf/pixelcrash-trial.otf"
 end
diff --git a/Casks/font-pixel-gamer-font-1764372239-0.rb b/Casks/font-pixel-gamer-font-1764372239-0.rb
index 64cf574..c0fe1a1 100644
--- a/Casks/font-pixel-gamer-font-1764372239-0.rb
+++ b/Casks/font-pixel-gamer-font-1764372239-0.rb
@@ -10,5 +10,5 @@ cask "font-pixel-gamer-font-1764372239-0" do
   name "Pixel Gamer Font 1764372239 0"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-pixel-gamer-font-1764372239-0/otf/pixelgamerpersonaluse-rg61l.otf"
+  font "homebrew-fonts/font_files/font-pixel-gamer-font-1764372239-0/otf/pixelgamerpersonaluse-rg61l.otf"
 end
diff --git a/Casks/font-pixel-grid-font-family-1764371982-0.rb b/Casks/font-pixel-grid-font-family-1764371982-0.rb
index 31962bc..188a371 100644
--- a/Casks/font-pixel-grid-font-family-1764371982-0.rb
+++ b/Casks/font-pixel-grid-font-family-1764371982-0.rb
@@ -10,208 +10,208 @@ cask "font-pixel-grid-font-family-1764371982-0" do
   name "Pixel Grid Font Family 1764371982 0"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-pixel-grid-font-family-1764371982-0/ttf/pixelgridtrial-fashionregxl.ttf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circleboldm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circlebolds.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circleboldxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circlelim.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circlelis.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circlelixl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circlemidm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circlemids.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circlenormm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circlenorms.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circlenormxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circleregm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circleregs.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circleregxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circlethinm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circlethins.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circlethinxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionboldm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionbolds.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionboldxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionlim.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionlis.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionlixl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionmidm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionmids.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionnormm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionnorms.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionnormxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionregm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionregs.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionregxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionthins.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionthinxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartboldm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartbolds.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartboldxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartlim.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartlis.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartlixl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartmidm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartmids.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartnormm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartnorms.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartnormxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartregm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartregs.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartregxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartthinm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartthins.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartthinxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownboldm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownbolds.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownboldxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownlim.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownlis.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownlixl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownmidm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownmids.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownnormm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownnorms.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownnormxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownregm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownregs.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownregxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownthinm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownthins.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownthinxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskyboldm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskybolds.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskyboldxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskylim.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskylis.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskylixl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskymidm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskymids.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskynormm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskynorms.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskynormxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskyregm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskyregs.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskyregxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskythinm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskythins.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskythinxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticboldm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticbolds.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticboldxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticlim.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticlis.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticlixl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticmidm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticmids.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticnormm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticnorms.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticnormxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticregm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticregs.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticregxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticthinm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticthins.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticthinxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointboldm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointbolds.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointboldxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointlim.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointlis.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointlixl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointmidm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointmids.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointnormm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointnorms.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointnormxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointregm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointregs.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointregxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointthinm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointthins.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointthinxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quickboldm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quickbolds.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quickboldxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quicklim.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quicklis.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quicklixl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quickmidm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quickmids.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quicknormm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quicknorms.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quicknormxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quickregm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quickregs.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quickregxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quickthinm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quickthins.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quickthinxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadowboldm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadowbolds.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadowboldxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadowlim.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadowlis.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadowlixl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadowmidm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadowmids.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadownormm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadownorms.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadownormxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadowregm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadowregs.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadowregxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadowthinm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadowthins.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadowthinxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squareboldm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squarebolds.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squareboldxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squaremidm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squaremids.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squarenormm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squarenorms.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squarenormxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squareregm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squareregs.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squareregxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squarethinm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squarethins.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squarethinxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squrelim.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squrelis.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squrelixl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-waterboldm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-waterbolds.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-waterboldxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-waterlim.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-waterlis.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-waterlixl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-watermidm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-watermids.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-waternormm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-waternorms.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-waternormxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-waterregm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-waterregs.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-waterregxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-waterthinm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-waterthins.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-waterthinxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windboldm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windbolds.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windboldxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windlim.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windlis.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windlixl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windmidm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windmids.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windnormm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windnorms.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windnormxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windregm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windregs.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windregxl.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windthinm.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windthins.otf"
-  font "font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windthinxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/ttf/pixelgridtrial-fashionregxl.ttf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circleboldm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circlebolds.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circleboldxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circlelim.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circlelis.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circlelixl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circlemidm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circlemids.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circlenormm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circlenorms.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circlenormxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circleregm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circleregs.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circleregxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circlethinm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circlethins.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-circlethinxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionboldm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionbolds.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionboldxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionlim.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionlis.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionlixl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionmidm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionmids.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionnormm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionnorms.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionnormxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionregm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionregs.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionregxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionthins.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-fashionthinxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartboldm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartbolds.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartboldxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartlim.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartlis.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartlixl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartmidm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartmids.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartnormm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartnorms.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartnormxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartregm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartregs.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartregxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartthinm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartthins.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-heartthinxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownboldm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownbolds.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownboldxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownlim.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownlis.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownlixl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownmidm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownmids.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownnormm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownnorms.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownnormxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownregm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownregs.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownregxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownthinm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownthins.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-linedownthinxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskyboldm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskybolds.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskyboldxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskylim.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskylis.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskylixl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskymidm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskymids.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskynormm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskynorms.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskynormxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskyregm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskyregs.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskyregxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskythinm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskythins.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-lineskythinxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticboldm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticbolds.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticboldxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticlim.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticlis.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticlixl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticmidm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticmids.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticnormm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticnorms.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticnormxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticregm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticregs.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticregxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticthinm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticthins.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-plasticthinxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointboldm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointbolds.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointboldxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointlim.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointlis.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointlixl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointmidm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointmids.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointnormm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointnorms.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointnormxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointregm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointregs.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointregxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointthinm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointthins.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-pointthinxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quickboldm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quickbolds.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quickboldxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quicklim.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quicklis.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quicklixl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quickmidm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quickmids.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quicknormm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quicknorms.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quicknormxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quickregm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quickregs.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quickregxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quickthinm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quickthins.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-quickthinxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadowboldm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadowbolds.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadowboldxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadowlim.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadowlis.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadowlixl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadowmidm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadowmids.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadownormm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadownorms.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadownormxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadowregm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadowregs.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadowregxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadowthinm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadowthins.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-shadowthinxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squareboldm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squarebolds.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squareboldxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squaremidm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squaremids.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squarenormm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squarenorms.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squarenormxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squareregm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squareregs.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squareregxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squarethinm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squarethins.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squarethinxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squrelim.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squrelis.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-squrelixl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-waterboldm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-waterbolds.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-waterboldxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-waterlim.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-waterlis.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-waterlixl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-watermidm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-watermids.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-waternormm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-waternorms.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-waternormxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-waterregm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-waterregs.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-waterregxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-waterthinm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-waterthins.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-waterthinxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windboldm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windbolds.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windboldxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windlim.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windlis.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windlixl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windmidm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windmids.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windnormm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windnorms.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windnormxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windregm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windregs.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windregxl.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windthinm.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windthins.otf"
+  font "homebrew-fonts/font_files/font-pixel-grid-font-family-1764371982-0/otf/pixelgridtrial-windthinxl.otf"
 end
diff --git a/Casks/font-pixelon.rb b/Casks/font-pixelon.rb
index fd390e3..cee8aed 100644
--- a/Casks/font-pixelon.rb
+++ b/Casks/font-pixelon.rb
@@ -10,6 +10,6 @@ cask "font-pixelon" do
   name "Pixelon"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-pixelon/ttf/pixelon-bf663182784222c.ttf"
-  font "font_files/font-pixelon/otf/pixelon-bf663182783f6a2.otf"
+  font "homebrew-fonts/font_files/font-pixelon/ttf/pixelon-bf663182784222c.ttf"
+  font "homebrew-fonts/font_files/font-pixelon/otf/pixelon-bf663182783f6a2.otf"
 end
diff --git a/Casks/font-plaztma.rb b/Casks/font-plaztma.rb
index d5b7604..e0b4c24 100644
--- a/Casks/font-plaztma.rb
+++ b/Casks/font-plaztma.rb
@@ -10,8 +10,8 @@ cask "font-plaztma" do
   name "Plaztma"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-plaztma/ttf/plaztma-oblique.ttf"
-  font "font_files/font-plaztma/ttf/plaztma.ttf"
-  font "font_files/font-plaztma/otf/plaztma-oblique.otf"
-  font "font_files/font-plaztma/otf/plaztma.otf"
+  font "homebrew-fonts/font_files/font-plaztma/ttf/plaztma-oblique.ttf"
+  font "homebrew-fonts/font_files/font-plaztma/ttf/plaztma.ttf"
+  font "homebrew-fonts/font_files/font-plaztma/otf/plaztma-oblique.otf"
+  font "homebrew-fonts/font_files/font-plaztma/otf/plaztma.otf"
 end
diff --git a/Casks/font-plebis.rb b/Casks/font-plebis.rb
index 0fd46bc..e4d98b6 100644
--- a/Casks/font-plebis.rb
+++ b/Casks/font-plebis.rb
@@ -10,5 +10,5 @@ cask "font-plebis" do
   name "Plebis"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-plebis/otf/plebis.otf"
+  font "homebrew-fonts/font_files/font-plebis/otf/plebis.otf"
 end
diff --git a/Casks/font-project-space.rb b/Casks/font-project-space.rb
index 9dd6784..56d794c 100644
--- a/Casks/font-project-space.rb
+++ b/Casks/font-project-space.rb
@@ -10,6 +10,6 @@ cask "font-project-space" do
   name "Project Space"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-project-space/ttf/project-space.ttf"
-  font "font_files/font-project-space/otf/project-space.otf"
+  font "homebrew-fonts/font_files/font-project-space/ttf/project-space.ttf"
+  font "homebrew-fonts/font_files/font-project-space/otf/project-space.otf"
 end
diff --git a/Casks/font-provisions.rb b/Casks/font-provisions.rb
index f09500e..294a45a 100644
--- a/Casks/font-provisions.rb
+++ b/Casks/font-provisions.rb
@@ -10,5 +10,5 @@ cask "font-provisions" do
   name "Provisions"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-provisions/otf/provisions-freepersonaluseonly.otf"
+  font "homebrew-fonts/font_files/font-provisions/otf/provisions-freepersonaluseonly.otf"
 end
diff --git a/Casks/font-qraydom-font-1764371345-0.rb b/Casks/font-qraydom-font-1764371345-0.rb
index 3dde648..99178da 100644
--- a/Casks/font-qraydom-font-1764371345-0.rb
+++ b/Casks/font-qraydom-font-1764371345-0.rb
@@ -10,5 +10,5 @@ cask "font-qraydom-font-1764371345-0" do
   name "Qraydom Font 1764371345 0"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-qraydom-font-1764371345-0/ttf/Qraydom.ttf"
+  font "homebrew-fonts/font_files/font-qraydom-font-1764371345-0/ttf/Qraydom.ttf"
 end
diff --git a/Casks/font-quasimoda-family.rb b/Casks/font-quasimoda-family.rb
index ead56e8..9d15470 100644
--- a/Casks/font-quasimoda-family.rb
+++ b/Casks/font-quasimoda-family.rb
@@ -10,28 +10,28 @@ cask "font-quasimoda-family" do
   name "Quasimoda Family"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-quasimoda-family/ttf/brother-bold.ttf"
-  font "font_files/font-quasimoda-family/otf/brother-bold.otf"
-  font "font_files/font-quasimoda-family/otf/lettersoup-quasimoda-black-italic.otf"
-  font "font_files/font-quasimoda-family/otf/lettersoup-quasimoda-black.otf"
-  font "font_files/font-quasimoda-family/otf/lettersoup-quasimoda-bold-italic.otf"
-  font "font_files/font-quasimoda-family/otf/lettersoup-quasimoda-bold.otf"
-  font "font_files/font-quasimoda-family/otf/lettersoup-quasimoda-extrabold-italic.otf"
-  font "font_files/font-quasimoda-family/otf/lettersoup-quasimoda-extrabold.otf"
-  font "font_files/font-quasimoda-family/otf/lettersoup-quasimoda-extralight-italic.otf"
-  font "font_files/font-quasimoda-family/otf/lettersoup-quasimoda-extralight.otf"
-  font "font_files/font-quasimoda-family/otf/lettersoup-quasimoda-hairline-italic.otf"
-  font "font_files/font-quasimoda-family/otf/lettersoup-quasimoda-hairline.otf"
-  font "font_files/font-quasimoda-family/otf/lettersoup-quasimoda-heavy-italic.otf"
-  font "font_files/font-quasimoda-family/otf/lettersoup-quasimoda-heavy.otf"
-  font "font_files/font-quasimoda-family/otf/lettersoup-quasimoda-italic.otf"
-  font "font_files/font-quasimoda-family/otf/lettersoup-quasimoda-light-italic.otf"
-  font "font_files/font-quasimoda-family/otf/lettersoup-quasimoda-light.otf"
-  font "font_files/font-quasimoda-family/otf/lettersoup-quasimoda-medium-italic.otf"
-  font "font_files/font-quasimoda-family/otf/lettersoup-quasimoda-medium.otf"
-  font "font_files/font-quasimoda-family/otf/lettersoup-quasimoda-regular.otf"
-  font "font_files/font-quasimoda-family/otf/lettersoup-quasimoda-semibold-italic.otf"
-  font "font_files/font-quasimoda-family/otf/lettersoup-quasimoda-semibold.otf"
-  font "font_files/font-quasimoda-family/otf/lettersoup-quasimoda-thin-italic.otf"
-  font "font_files/font-quasimoda-family/otf/lettersoup-quasimoda-thin.otf"
+  font "homebrew-fonts/font_files/font-quasimoda-family/ttf/brother-bold.ttf"
+  font "homebrew-fonts/font_files/font-quasimoda-family/otf/brother-bold.otf"
+  font "homebrew-fonts/font_files/font-quasimoda-family/otf/lettersoup-quasimoda-black-italic.otf"
+  font "homebrew-fonts/font_files/font-quasimoda-family/otf/lettersoup-quasimoda-black.otf"
+  font "homebrew-fonts/font_files/font-quasimoda-family/otf/lettersoup-quasimoda-bold-italic.otf"
+  font "homebrew-fonts/font_files/font-quasimoda-family/otf/lettersoup-quasimoda-bold.otf"
+  font "homebrew-fonts/font_files/font-quasimoda-family/otf/lettersoup-quasimoda-extrabold-italic.otf"
+  font "homebrew-fonts/font_files/font-quasimoda-family/otf/lettersoup-quasimoda-extrabold.otf"
+  font "homebrew-fonts/font_files/font-quasimoda-family/otf/lettersoup-quasimoda-extralight-italic.otf"
+  font "homebrew-fonts/font_files/font-quasimoda-family/otf/lettersoup-quasimoda-extralight.otf"
+  font "homebrew-fonts/font_files/font-quasimoda-family/otf/lettersoup-quasimoda-hairline-italic.otf"
+  font "homebrew-fonts/font_files/font-quasimoda-family/otf/lettersoup-quasimoda-hairline.otf"
+  font "homebrew-fonts/font_files/font-quasimoda-family/otf/lettersoup-quasimoda-heavy-italic.otf"
+  font "homebrew-fonts/font_files/font-quasimoda-family/otf/lettersoup-quasimoda-heavy.otf"
+  font "homebrew-fonts/font_files/font-quasimoda-family/otf/lettersoup-quasimoda-italic.otf"
+  font "homebrew-fonts/font_files/font-quasimoda-family/otf/lettersoup-quasimoda-light-italic.otf"
+  font "homebrew-fonts/font_files/font-quasimoda-family/otf/lettersoup-quasimoda-light.otf"
+  font "homebrew-fonts/font_files/font-quasimoda-family/otf/lettersoup-quasimoda-medium-italic.otf"
+  font "homebrew-fonts/font_files/font-quasimoda-family/otf/lettersoup-quasimoda-medium.otf"
+  font "homebrew-fonts/font_files/font-quasimoda-family/otf/lettersoup-quasimoda-regular.otf"
+  font "homebrew-fonts/font_files/font-quasimoda-family/otf/lettersoup-quasimoda-semibold-italic.otf"
+  font "homebrew-fonts/font_files/font-quasimoda-family/otf/lettersoup-quasimoda-semibold.otf"
+  font "homebrew-fonts/font_files/font-quasimoda-family/otf/lettersoup-quasimoda-thin-italic.otf"
+  font "homebrew-fonts/font_files/font-quasimoda-family/otf/lettersoup-quasimoda-thin.otf"
 end
diff --git a/Casks/font-revain.rb b/Casks/font-revain.rb
index d2b227d..aed5c96 100644
--- a/Casks/font-revain.rb
+++ b/Casks/font-revain.rb
@@ -10,5 +10,5 @@ cask "font-revain" do
   name "Revain"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-revain/ttf/revain-regular.ttf"
+  font "homebrew-fonts/font_files/font-revain/ttf/revain-regular.ttf"
 end
diff --git a/Casks/font-rigid-light.rb b/Casks/font-rigid-light.rb
index e516f36..a78e8e5 100644
--- a/Casks/font-rigid-light.rb
+++ b/Casks/font-rigid-light.rb
@@ -10,6 +10,6 @@ cask "font-rigid-light" do
   name "Rigid Light"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-rigid-light/ttf/rigid-display-light.ttf"
-  font "font_files/font-rigid-light/otf/rigid-display-light.otf"
+  font "homebrew-fonts/font_files/font-rigid-light/ttf/rigid-display-light.ttf"
+  font "homebrew-fonts/font_files/font-rigid-light/otf/rigid-display-light.otf"
 end
diff --git a/Casks/font-rocky_monkey.rb b/Casks/font-rocky_monkey.rb
index 1371fd7..e4405d9 100644
--- a/Casks/font-rocky_monkey.rb
+++ b/Casks/font-rocky_monkey.rb
@@ -10,8 +10,8 @@ cask "font-rocky_monkey" do
   name "Rocky Monkey"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-rocky_monkey/ttf/rocky-monkey-italic.ttf"
-  font "font_files/font-rocky_monkey/ttf/rocky-monkey.ttf"
-  font "font_files/font-rocky_monkey/otf/rocky-monkey-italic.otf"
-  font "font_files/font-rocky_monkey/otf/rocky-monkey.otf"
+  font "homebrew-fonts/font_files/font-rocky_monkey/ttf/rocky-monkey-italic.ttf"
+  font "homebrew-fonts/font_files/font-rocky_monkey/ttf/rocky-monkey.ttf"
+  font "homebrew-fonts/font_files/font-rocky_monkey/otf/rocky-monkey-italic.otf"
+  font "homebrew-fonts/font_files/font-rocky_monkey/otf/rocky-monkey.otf"
 end
diff --git a/Casks/font-rondack.rb b/Casks/font-rondack.rb
index 1eca7e9..f5b89de 100644
--- a/Casks/font-rondack.rb
+++ b/Casks/font-rondack.rb
@@ -10,5 +10,5 @@ cask "font-rondack" do
   name "Rondack"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-rondack/otf/rondack-personaluseonly.otf"
+  font "homebrew-fonts/font_files/font-rondack/otf/rondack-personaluseonly.otf"
 end
diff --git a/Casks/font-runa.rb b/Casks/font-runa.rb
index 970f25b..4bde996 100644
--- a/Casks/font-runa.rb
+++ b/Casks/font-runa.rb
@@ -10,5 +10,5 @@ cask "font-runa" do
   name "Runa"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-runa/otf/runa.otf"
+  font "homebrew-fonts/font_files/font-runa/otf/runa.otf"
 end
diff --git a/Casks/font-rusillaserif.rb b/Casks/font-rusillaserif.rb
index b7d9cf0..75df8de 100644
--- a/Casks/font-rusillaserif.rb
+++ b/Casks/font-rusillaserif.rb
@@ -10,6 +10,6 @@ cask "font-rusillaserif" do
   name "Rusillaserif"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-rusillaserif/otf/rusillaserif-light.otf"
-  font "font_files/font-rusillaserif/otf/rusillaserif-regular.otf"
+  font "homebrew-fonts/font_files/font-rusillaserif/otf/rusillaserif-light.otf"
+  font "homebrew-fonts/font_files/font-rusillaserif/otf/rusillaserif-regular.otf"
 end
diff --git a/Casks/font-ruska.rb b/Casks/font-ruska.rb
index 7e2c29f..0b0c58b 100644
--- a/Casks/font-ruska.rb
+++ b/Casks/font-ruska.rb
@@ -10,5 +10,5 @@ cask "font-ruska" do
   name "Ruska"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-ruska/otf/ruskadisplay-regular.otf"
+  font "homebrew-fonts/font_files/font-ruska/otf/ruskadisplay-regular.otf"
 end
diff --git a/Casks/font-scratches.rb b/Casks/font-scratches.rb
index c8b5fa6..0c0a5be 100644
--- a/Casks/font-scratches.rb
+++ b/Casks/font-scratches.rb
@@ -10,5 +10,5 @@ cask "font-scratches" do
   name "Scratches"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-scratches/otf/scratches.otf"
+  font "homebrew-fonts/font_files/font-scratches/otf/scratches.otf"
 end
diff --git a/Casks/font-scribblingtom.rb b/Casks/font-scribblingtom.rb
index 56c29a2..c2fd14f 100644
--- a/Casks/font-scribblingtom.rb
+++ b/Casks/font-scribblingtom.rb
@@ -10,5 +10,5 @@ cask "font-scribblingtom" do
   name "Scribblingtom"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-scribblingtom/otf/scribblingtom.otf"
+  font "homebrew-fonts/font_files/font-scribblingtom/otf/scribblingtom.otf"
 end
diff --git a/Casks/font-sepura-light.rb b/Casks/font-sepura-light.rb
index e74a87d..6be97d4 100644
--- a/Casks/font-sepura-light.rb
+++ b/Casks/font-sepura-light.rb
@@ -10,5 +10,5 @@ cask "font-sepura-light" do
   name "Sepura Light"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-sepura-light/otf/sepura-light.otf"
+  font "homebrew-fonts/font_files/font-sepura-light/otf/sepura-light.otf"
 end
diff --git a/Casks/font-sideboard.rb b/Casks/font-sideboard.rb
index e2d095e..5d1e787 100644
--- a/Casks/font-sideboard.rb
+++ b/Casks/font-sideboard.rb
@@ -10,5 +10,5 @@ cask "font-sideboard" do
   name "Sideboard"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-sideboard/otf/sideboard-personaluseonly.otf"
+  font "homebrew-fonts/font_files/font-sideboard/otf/sideboard-personaluseonly.otf"
 end
diff --git a/Casks/font-siesta-serenade.rb b/Casks/font-siesta-serenade.rb
index e8edbc9..2dde6ab 100644
--- a/Casks/font-siesta-serenade.rb
+++ b/Casks/font-siesta-serenade.rb
@@ -10,5 +10,5 @@ cask "font-siesta-serenade" do
   name "Siesta Serenade"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-siesta-serenade/otf/siestaserenade-personaluseonly.otf"
+  font "homebrew-fonts/font_files/font-siesta-serenade/otf/siestaserenade-personaluseonly.otf"
 end
diff --git a/Casks/font-sigitarian.rb b/Casks/font-sigitarian.rb
index 7b9fb01..c396cf9 100644
--- a/Casks/font-sigitarian.rb
+++ b/Casks/font-sigitarian.rb
@@ -10,6 +10,6 @@ cask "font-sigitarian" do
   name "Sigitarian"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-sigitarian/ttf/sigitarian.ttf"
-  font "font_files/font-sigitarian/otf/sigitarian.otf"
+  font "homebrew-fonts/font_files/font-sigitarian/ttf/sigitarian.ttf"
+  font "homebrew-fonts/font_files/font-sigitarian/otf/sigitarian.otf"
 end
diff --git a/Casks/font-signate-grotesk-black.rb b/Casks/font-signate-grotesk-black.rb
index 0964841..c944d66 100644
--- a/Casks/font-signate-grotesk-black.rb
+++ b/Casks/font-signate-grotesk-black.rb
@@ -10,5 +10,5 @@ cask "font-signate-grotesk-black" do
   name "Signate Grotesk Black"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-signate-grotesk-black/ttf/signategrotesk-black.ttf"
+  font "homebrew-fonts/font_files/font-signate-grotesk-black/ttf/signategrotesk-black.ttf"
 end
diff --git a/Casks/font-silkshy.rb b/Casks/font-silkshy.rb
index f4f1112..4550f7e 100644
--- a/Casks/font-silkshy.rb
+++ b/Casks/font-silkshy.rb
@@ -10,8 +10,8 @@ cask "font-silkshy" do
   name "Silkshy"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-silkshy/ttf/silkshy.ttf"
-  font "font_files/font-silkshy/ttf/silkshyoblique.ttf"
-  font "font_files/font-silkshy/otf/silkshy.otf"
-  font "font_files/font-silkshy/otf/silkshyoblique.otf"
+  font "homebrew-fonts/font_files/font-silkshy/ttf/silkshy.ttf"
+  font "homebrew-fonts/font_files/font-silkshy/ttf/silkshyoblique.ttf"
+  font "homebrew-fonts/font_files/font-silkshy/otf/silkshy.otf"
+  font "homebrew-fonts/font_files/font-silkshy/otf/silkshyoblique.otf"
 end
diff --git a/Casks/font-space-rabbit-font-1764372251-0.rb b/Casks/font-space-rabbit-font-1764372251-0.rb
index 243307c..fc21d3f 100644
--- a/Casks/font-space-rabbit-font-1764372251-0.rb
+++ b/Casks/font-space-rabbit-font-1764372251-0.rb
@@ -10,5 +10,5 @@ cask "font-space-rabbit-font-1764372251-0" do
   name "Space Rabbit Font 1764372251 0"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-space-rabbit-font-1764372251-0/otf/Space-Rabbit.otf"
+  font "homebrew-fonts/font_files/font-space-rabbit-font-1764372251-0/otf/Space-Rabbit.otf"
 end
diff --git a/Casks/font-spencer.rb b/Casks/font-spencer.rb
index 7475426..2affe01 100644
--- a/Casks/font-spencer.rb
+++ b/Casks/font-spencer.rb
@@ -10,6 +10,6 @@ cask "font-spencer" do
   name "Spencer"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-spencer/ttf/spencer.ttf"
-  font "font_files/font-spencer/otf/spencer.otf"
+  font "homebrew-fonts/font_files/font-spencer/ttf/spencer.ttf"
+  font "homebrew-fonts/font_files/font-spencer/otf/spencer.otf"
 end
diff --git a/Casks/font-springwood_note.rb b/Casks/font-springwood_note.rb
index 98b8393..d7457d0 100644
--- a/Casks/font-springwood_note.rb
+++ b/Casks/font-springwood_note.rb
@@ -10,6 +10,6 @@ cask "font-springwood_note" do
   name "Springwood Note"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-springwood_note/otf/springwood-line-demo.otf"
-  font "font_files/font-springwood_note/otf/springwood-note-demo.otf"
+  font "homebrew-fonts/font_files/font-springwood_note/otf/springwood-line-demo.otf"
+  font "homebrew-fonts/font_files/font-springwood_note/otf/springwood-note-demo.otf"
 end
diff --git a/Casks/font-spritegraffiti.rb b/Casks/font-spritegraffiti.rb
index d88af8c..3805d49 100644
--- a/Casks/font-spritegraffiti.rb
+++ b/Casks/font-spritegraffiti.rb
@@ -10,10 +10,10 @@ cask "font-spritegraffiti" do
   name "Spritegraffiti"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-spritegraffiti/ttf/spritegraffiti-extras.ttf"
-  font "font_files/font-spritegraffiti/ttf/spritegraffiti-regular.ttf"
-  font "font_files/font-spritegraffiti/ttf/spritegraffiti-shadow.ttf"
-  font "font_files/font-spritegraffiti/otf/spritegraffiti-extras.otf"
-  font "font_files/font-spritegraffiti/otf/spritegraffiti-regular.otf"
-  font "font_files/font-spritegraffiti/otf/spritegraffiti-shadow.otf"
+  font "homebrew-fonts/font_files/font-spritegraffiti/ttf/spritegraffiti-extras.ttf"
+  font "homebrew-fonts/font_files/font-spritegraffiti/ttf/spritegraffiti-regular.ttf"
+  font "homebrew-fonts/font_files/font-spritegraffiti/ttf/spritegraffiti-shadow.ttf"
+  font "homebrew-fonts/font_files/font-spritegraffiti/otf/spritegraffiti-extras.otf"
+  font "homebrew-fonts/font_files/font-spritegraffiti/otf/spritegraffiti-regular.otf"
+  font "homebrew-fonts/font_files/font-spritegraffiti/otf/spritegraffiti-shadow.otf"
 end
diff --git a/Casks/font-starship.rb b/Casks/font-starship.rb
index 3d8b555..6c9400f 100644
--- a/Casks/font-starship.rb
+++ b/Casks/font-starship.rb
@@ -10,6 +10,6 @@ cask "font-starship" do
   name "Starship"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-starship/ttf/starship.ttf"
-  font "font_files/font-starship/otf/starship.otf"
+  font "homebrew-fonts/font_files/font-starship/ttf/starship.ttf"
+  font "homebrew-fonts/font_files/font-starship/otf/starship.otf"
 end
diff --git a/Casks/font-stockman.rb b/Casks/font-stockman.rb
index 6065087..4a6ce76 100644
--- a/Casks/font-stockman.rb
+++ b/Casks/font-stockman.rb
@@ -10,5 +10,5 @@ cask "font-stockman" do
   name "Stockman"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-stockman/otf/stockman-demo-personaluseonly.otf"
+  font "homebrew-fonts/font_files/font-stockman/otf/stockman-demo-personaluseonly.otf"
 end
diff --git a/Casks/font-stronghold.rb b/Casks/font-stronghold.rb
index b23eb95..7d4fe4f 100644
--- a/Casks/font-stronghold.rb
+++ b/Casks/font-stronghold.rb
@@ -10,8 +10,8 @@ cask "font-stronghold" do
   name "Stronghold"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-stronghold/ttf/stronghold-italic.ttf"
-  font "font_files/font-stronghold/ttf/stronghold-regular.ttf"
-  font "font_files/font-stronghold/otf/stronghold-italic.otf"
-  font "font_files/font-stronghold/otf/stronghold-regular.otf"
+  font "homebrew-fonts/font_files/font-stronghold/ttf/stronghold-italic.ttf"
+  font "homebrew-fonts/font_files/font-stronghold/ttf/stronghold-regular.ttf"
+  font "homebrew-fonts/font_files/font-stronghold/otf/stronghold-italic.otf"
+  font "homebrew-fonts/font_files/font-stronghold/otf/stronghold-regular.otf"
 end
diff --git a/Casks/font-sunmore.rb b/Casks/font-sunmore.rb
index 8439778..a066bfb 100644
--- a/Casks/font-sunmore.rb
+++ b/Casks/font-sunmore.rb
@@ -10,5 +10,5 @@ cask "font-sunmore" do
   name "Sunmore"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-sunmore/ttf/sunmore-slant-free.ttf"
+  font "homebrew-fonts/font_files/font-sunmore/ttf/sunmore-slant-free.ttf"
 end
diff --git a/Casks/font-tallow-pen.rb b/Casks/font-tallow-pen.rb
index 1bb9248..30413ef 100644
--- a/Casks/font-tallow-pen.rb
+++ b/Casks/font-tallow-pen.rb
@@ -10,6 +10,6 @@ cask "font-tallow-pen" do
   name "Tallow Pen"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-tallow-pen/otf/tallowsanstc-pen.otf"
-  font "font_files/font-tallow-pen/otf/tallowtc-pen.otf"
+  font "homebrew-fonts/font_files/font-tallow-pen/otf/tallowsanstc-pen.otf"
+  font "homebrew-fonts/font_files/font-tallow-pen/otf/tallowtc-pen.otf"
 end
diff --git a/Casks/font-tc_kindred.rb b/Casks/font-tc_kindred.rb
index a1eed39..e5546fe 100644
--- a/Casks/font-tc_kindred.rb
+++ b/Casks/font-tc_kindred.rb
@@ -10,5 +10,5 @@ cask "font-tc_kindred" do
   name "Tc Kindred"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-tc_kindred/otf/kindred.otf"
+  font "homebrew-fonts/font_files/font-tc_kindred/otf/kindred.otf"
 end
diff --git a/Casks/font-tcacrylichand.rb b/Casks/font-tcacrylichand.rb
index 569f9b5..7459203 100644
--- a/Casks/font-tcacrylichand.rb
+++ b/Casks/font-tcacrylichand.rb
@@ -10,5 +10,5 @@ cask "font-tcacrylichand" do
   name "Tcacrylichand"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-tcacrylichand/ttf/tcacrylichand.ttc"
+  font "homebrew-fonts/font_files/font-tcacrylichand/ttf/tcacrylichand.ttc"
 end
diff --git a/Casks/font-techla.rb b/Casks/font-techla.rb
index 503123e..d7a400b 100644
--- a/Casks/font-techla.rb
+++ b/Casks/font-techla.rb
@@ -10,5 +10,5 @@ cask "font-techla" do
   name "Techla"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-techla/otf/techla.otf"
+  font "homebrew-fonts/font_files/font-techla/otf/techla.otf"
 end
diff --git a/Casks/font-teenage-yellow-star.rb b/Casks/font-teenage-yellow-star.rb
index 71688f9..0a9ae83 100644
--- a/Casks/font-teenage-yellow-star.rb
+++ b/Casks/font-teenage-yellow-star.rb
@@ -10,5 +10,5 @@ cask "font-teenage-yellow-star" do
   name "Teenage Yellow Star"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-teenage-yellow-star/otf/teenage-yellow-star-svg.otf"
+  font "homebrew-fonts/font_files/font-teenage-yellow-star/otf/teenage-yellow-star-svg.otf"
 end
diff --git a/Casks/font-tf-madcloud-teenage-foundry.rb b/Casks/font-tf-madcloud-teenage-foundry.rb
index af397cd..19bfb23 100644
--- a/Casks/font-tf-madcloud-teenage-foundry.rb
+++ b/Casks/font-tf-madcloud-teenage-foundry.rb
@@ -10,6 +10,6 @@ cask "font-tf-madcloud-teenage-foundry" do
   name "Tf Madcloud Teenage Foundry"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-tf-madcloud-teenage-foundry/ttf/tf-madloud-demo.ttf"
-  font "font_files/font-tf-madcloud-teenage-foundry/otf/tf-madloud-demo.otf"
+  font "homebrew-fonts/font_files/font-tf-madcloud-teenage-foundry/ttf/tf-madloud-demo.ttf"
+  font "homebrew-fonts/font_files/font-tf-madcloud-teenage-foundry/otf/tf-madloud-demo.otf"
 end
diff --git a/Casks/font-the-great-outdoors.rb b/Casks/font-the-great-outdoors.rb
index c87b67c..63f8f47 100644
--- a/Casks/font-the-great-outdoors.rb
+++ b/Casks/font-the-great-outdoors.rb
@@ -10,6 +10,6 @@ cask "font-the-great-outdoors" do
   name "The Great Outdoors"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-the-great-outdoors/otf/thegreatoutdoors-regular.otf"
-  font "font_files/font-the-great-outdoors/otf/thegreatoutdoors-rough-regular.otf"
+  font "homebrew-fonts/font_files/font-the-great-outdoors/otf/thegreatoutdoors-regular.otf"
+  font "homebrew-fonts/font_files/font-the-great-outdoors/otf/thegreatoutdoors-rough-regular.otf"
 end
diff --git a/Casks/font-thourenz-inked.rb b/Casks/font-thourenz-inked.rb
index 2985d99..839463b 100644
--- a/Casks/font-thourenz-inked.rb
+++ b/Casks/font-thourenz-inked.rb
@@ -10,6 +10,6 @@ cask "font-thourenz-inked" do
   name "Thourenz Inked"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-thourenz-inked/ttf/thourenz-inked.ttf"
-  font "font_files/font-thourenz-inked/otf/thourenz-inked.otf"
+  font "homebrew-fonts/font_files/font-thourenz-inked/ttf/thourenz-inked.ttf"
+  font "homebrew-fonts/font_files/font-thourenz-inked/otf/thourenz-inked.otf"
 end
diff --git a/Casks/font-tyler-handwriting.rb b/Casks/font-tyler-handwriting.rb
index 4224744..a338fff 100644
--- a/Casks/font-tyler-handwriting.rb
+++ b/Casks/font-tyler-handwriting.rb
@@ -10,5 +10,5 @@ cask "font-tyler-handwriting" do
   name "Tyler Handwriting"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-tyler-handwriting/otf/tyler-handwriting.otf"
+  font "homebrew-fonts/font_files/font-tyler-handwriting/otf/tyler-handwriting.otf"
 end
diff --git a/Casks/font-valofire.rb b/Casks/font-valofire.rb
index 487d092..094d6eb 100644
--- a/Casks/font-valofire.rb
+++ b/Casks/font-valofire.rb
@@ -10,5 +10,5 @@ cask "font-valofire" do
   name "Valofire"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-valofire/ttf/valofire-personal-used.ttf"
+  font "homebrew-fonts/font_files/font-valofire/ttf/valofire-personal-used.ttf"
 end
diff --git a/Casks/font-vampire-mansion.rb b/Casks/font-vampire-mansion.rb
index d9b2b67..2c87fbe 100644
--- a/Casks/font-vampire-mansion.rb
+++ b/Casks/font-vampire-mansion.rb
@@ -10,5 +10,5 @@ cask "font-vampire-mansion" do
   name "Vampire Mansion"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-vampire-mansion/otf/vampire-mansion.otf"
+  font "homebrew-fonts/font_files/font-vampire-mansion/otf/vampire-mansion.otf"
 end
diff --git a/Casks/font-vaselina.rb b/Casks/font-vaselina.rb
index 818c928..cc2cc02 100644
--- a/Casks/font-vaselina.rb
+++ b/Casks/font-vaselina.rb
@@ -10,6 +10,6 @@ cask "font-vaselina" do
   name "Vaselina"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-vaselina/otf/veselina-script.otf"
-  font "font_files/font-vaselina/otf/veselina.otf"
+  font "homebrew-fonts/font_files/font-vaselina/otf/veselina-script.otf"
+  font "homebrew-fonts/font_files/font-vaselina/otf/veselina.otf"
 end
diff --git a/Casks/font-virus_killer.rb b/Casks/font-virus_killer.rb
index f43aef0..9142409 100644
--- a/Casks/font-virus_killer.rb
+++ b/Casks/font-virus_killer.rb
@@ -10,6 +10,6 @@ cask "font-virus_killer" do
   name "Virus Killer"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-virus_killer/ttf/virus-killer.ttf"
-  font "font_files/font-virus_killer/otf/virus-killer.otf"
+  font "homebrew-fonts/font_files/font-virus_killer/ttf/virus-killer.ttf"
+  font "homebrew-fonts/font_files/font-virus_killer/otf/virus-killer.otf"
 end
diff --git a/Casks/font-west-river.rb b/Casks/font-west-river.rb
index e40ca27..e1db16a 100644
--- a/Casks/font-west-river.rb
+++ b/Casks/font-west-river.rb
@@ -10,5 +10,5 @@ cask "font-west-river" do
   name "West River"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-west-river/otf/westriver-regular.otf"
+  font "homebrew-fonts/font_files/font-west-river/otf/westriver-regular.otf"
 end
diff --git a/Casks/font-whtpny.rb b/Casks/font-whtpny.rb
index 65c7891..7f2138e 100644
--- a/Casks/font-whtpny.rb
+++ b/Casks/font-whtpny.rb
@@ -10,7 +10,7 @@ cask "font-whtpny" do
   name "Whtpny"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-whtpny/otf/whtpny-lcd.otf"
-  font "font_files/font-whtpny/otf/whtpny.otf"
-  font "font_files/font-whtpny/otf/whtpnypx.otf"
+  font "homebrew-fonts/font_files/font-whtpny/otf/whtpny-lcd.otf"
+  font "homebrew-fonts/font_files/font-whtpny/otf/whtpny.otf"
+  font "homebrew-fonts/font_files/font-whtpny/otf/whtpnypx.otf"
 end
diff --git a/Casks/font-wistonia-signature.rb b/Casks/font-wistonia-signature.rb
index 12894b7..20d80e3 100644
--- a/Casks/font-wistonia-signature.rb
+++ b/Casks/font-wistonia-signature.rb
@@ -10,6 +10,6 @@ cask "font-wistonia-signature" do
   name "Wistonia Signature"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-wistonia-signature/ttf/wistonia-signature.ttf"
-  font "font_files/font-wistonia-signature/otf/wistonia-signature.otf"
+  font "homebrew-fonts/font_files/font-wistonia-signature/ttf/wistonia-signature.ttf"
+  font "homebrew-fonts/font_files/font-wistonia-signature/otf/wistonia-signature.otf"
 end
diff --git a/Casks/font-ws-lowen.rb b/Casks/font-ws-lowen.rb
index f6f1ace..2279fb9 100644
--- a/Casks/font-ws-lowen.rb
+++ b/Casks/font-ws-lowen.rb
@@ -10,5 +10,5 @@ cask "font-ws-lowen" do
   name "Ws Lowen"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-ws-lowen/ttf/ws-lowen-demo.ttf"
+  font "homebrew-fonts/font_files/font-ws-lowen/ttf/ws-lowen-demo.ttf"
 end
diff --git a/Casks/font-wt-karsa-mono.rb b/Casks/font-wt-karsa-mono.rb
index 150bbec..16dfac8 100644
--- a/Casks/font-wt-karsa-mono.rb
+++ b/Casks/font-wt-karsa-mono.rb
@@ -10,6 +10,6 @@ cask "font-wt-karsa-mono" do
   name "Wt Karsa Mono"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-wt-karsa-mono/ttf/wt-karsa-mono.ttf"
-  font "font_files/font-wt-karsa-mono/otf/wt-karsa-mono.otf"
+  font "homebrew-fonts/font_files/font-wt-karsa-mono/ttf/wt-karsa-mono.ttf"
+  font "homebrew-fonts/font_files/font-wt-karsa-mono/otf/wt-karsa-mono.otf"
 end
diff --git a/Casks/font-youchat.rb b/Casks/font-youchat.rb
index 777f3d6..6c0576e 100644
--- a/Casks/font-youchat.rb
+++ b/Casks/font-youchat.rb
@@ -10,6 +10,6 @@ cask "font-youchat" do
   name "Youchat"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-youchat/ttf/youchat.ttf"
-  font "font_files/font-youchat/otf/youchat.otf"
+  font "homebrew-fonts/font_files/font-youchat/ttf/youchat.ttf"
+  font "homebrew-fonts/font_files/font-youchat/otf/youchat.otf"
 end
diff --git a/Casks/font-zebra.rb b/Casks/font-zebra.rb
index d8f2fec..b1c81f5 100644
--- a/Casks/font-zebra.rb
+++ b/Casks/font-zebra.rb
@@ -10,8 +10,8 @@ cask "font-zebra" do
   name "Zebra"
   homepage "http://clancy.genet-godzilla.ts.net:8085/Fonts/homebrew-fonts"
 
-  font "font_files/font-zebra/ttf/zebra-neg.ttf"
-  font "font_files/font-zebra/ttf/zebra.ttf"
-  font "font_files/font-zebra/otf/zebra-neg.otf"
-  font "font_files/font-zebra/otf/zebra.otf"
+  font "homebrew-fonts/font_files/font-zebra/ttf/zebra-neg.ttf"
+  font "homebrew-fonts/font_files/font-zebra/ttf/zebra.ttf"
+  font "homebrew-fonts/font_files/font-zebra/otf/zebra-neg.otf"
+  font "homebrew-fonts/font_files/font-zebra/otf/zebra.otf"
 end
diff --git a/tests/test_formula_content.py b/tests/test_formula_content.py
index 3f12b6d..c576274 100644
--- a/tests/test_formula_content.py
+++ b/tests/test_formula_content.py
@@ -18,8 +18,8 @@ def test_cask_references_correct_font_path(font_name):
     _skip_if_no_cask(font_name)
     cask_path = CASKS_DIR / f"{font_name}.rb"
     content = cask_path.read_text()
-    assert f"font_files/{font_name}/" in content, (
-        f"{font_name}: cask does not reference font_files/{font_name}/"
+    assert f"homebrew-fonts/font_files/{font_name}/" in content, (
+        f"{font_name}: cask does not reference homebrew-fonts/font_files/{font_name}/"
     )
 
 
@@ -52,10 +52,12 @@ def test_cask_font_files_exist_on_disk(font_name):
     _skip_if_no_cask(font_name)
     cask_path = CASKS_DIR / f"{font_name}.rb"
     content = cask_path.read_text()
-    # Extract paths from font "..." lines
+    # Extract paths from font "..." lines; strip the homebrew-fonts/ archive prefix
     paths = re.findall(r'^\s*font\s+"([^"]+)"', content, re.MULTILINE)
     for rel_path in paths:
-        full_path = FONT_FILES_DIR.parent / rel_path
+        # Cask paths include archive root prefix: homebrew-fonts/font_files/...
+        local_path = rel_path.replace("homebrew-fonts/", "", 1)
+        full_path = FONT_FILES_DIR.parent / local_path
         assert full_path.is_file(), (
             f"{font_name}: font artifact references missing file: {rel_path}"
         )
diff --git a/tests/test_install_works.py b/tests/test_install_works.py
index b9a971b..3613430 100644
--- a/tests/test_install_works.py
+++ b/tests/test_install_works.py
@@ -18,7 +18,8 @@ def test_cask_font_artifacts_are_installable(font_name):
     assert paths, f"{font_name}: cask has no font artifacts"
 
     for rel_path in paths:
-        full_path = FONT_FILES_DIR.parent / rel_path
+        local_path = rel_path.replace("homebrew-fonts/", "", 1)
+        full_path = FONT_FILES_DIR.parent / local_path
         assert full_path.is_file(), f"{font_name}: missing font file: {rel_path}"
         assert full_path.suffix.lower() in (".ttf", ".otf", ".ttc"), (
             f"{font_name}: unexpected font type: {full_path.suffix}"