diff --git a/.gitattributes b/.gitattributes
index e335fa74c66..8e461bc6660 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -899,6 +899,7 @@ forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorWins
 forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CProbabilities.java -text
 forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CStatistics.java -text
 forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/DeckController.java -text
+forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/DeckHtmlSerializer.java -text
 forge-gui-desktop/src/main/java/forge/screens/deckeditor/menus/CDeckEditorUIMenus.java -text
 forge-gui-desktop/src/main/java/forge/screens/deckeditor/menus/DeckFileMenu.java -text
 forge-gui-desktop/src/main/java/forge/screens/deckeditor/package-info.java -text
@@ -17152,7 +17153,6 @@ forge-gui/src/main/java/forge/deck/DeckProxy.java -text
 forge-gui/src/main/java/forge/deck/DeckType.java -text
 forge-gui/src/main/java/forge/deck/DeckgenUtil.java -text
 forge-gui/src/main/java/forge/deck/RandomDeckGenerator.java -text
-forge-gui/src/main/java/forge/deck/io/DeckHtmlSerializer.java -text
 forge-gui/src/main/java/forge/deck/io/DeckPreferences.java -text
 forge-gui/src/main/java/forge/deck/io/OldDeckParser.java -text
 forge-gui/src/main/java/forge/download/GuiDownloadPicturesLQ.java -text
diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CCurrentDeck.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CCurrentDeck.java
index 76d0c063531..94c26d3925a 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CCurrentDeck.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CCurrentDeck.java
@@ -4,7 +4,6 @@ import forge.UiCommand;
 import forge.Singletons;
 import forge.deck.Deck;
 import forge.deck.DeckBase;
-import forge.deck.io.DeckHtmlSerializer;
 import forge.deck.io.DeckSerializer;
 import forge.deck.io.DeckStorage;
 import forge.gui.framework.ICDoc;
diff --git a/forge-gui/src/main/java/forge/deck/io/DeckHtmlSerializer.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/DeckHtmlSerializer.java
similarity index 94%
rename from forge-gui/src/main/java/forge/deck/io/DeckHtmlSerializer.java
rename to forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/DeckHtmlSerializer.java
index e3631c84570..a1eef304ee9 100644
--- a/forge-gui/src/main/java/forge/deck/io/DeckHtmlSerializer.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/DeckHtmlSerializer.java
@@ -1,4 +1,4 @@
-package forge.deck.io;
+package forge.screens.deckeditor.controllers;
 
 import forge.deck.Deck;
 import forge.item.PaperCard;
@@ -48,7 +48,7 @@ public class DeckHtmlSerializer {
             /* Create and adjust the configuration */
             final Configuration cfg = new Configuration();
             try {
-                cfg.setClassForTemplateLoading(d.getClass(), "/");
+                cfg.setClassForTemplateLoading(DeckHtmlSerializer.class, "/");
                 cfg.setObjectWrapper(new DefaultObjectWrapper());
     
                 /*
diff --git a/forge-gui/pom.xml b/forge-gui/pom.xml
index 8ec924f4eb3..de67c2e7784 100644
--- a/forge-gui/pom.xml
+++ b/forge-gui/pom.xml
@@ -46,10 +46,5 @@
 	        <artifactId>commons-lang3</artifactId>
             <version>3.3</version>
         </dependency>
-        <dependency>
-            <groupId>org.freemarker</groupId>
-            <artifactId>freemarker</artifactId>
-            <version>2.3.20</version>
-        </dependency>
     </dependencies>
 </project>