diff --git a/filerenamer.py b/filerenamer.py
index 511cace..4ca2953 100644
--- a/filerenamer.py
+++ b/filerenamer.py
@@ -95,6 +95,19 @@ class FileRenamer:
 					dt = datetime.datetime( 1970, int(md.month), 1, 0, 0)
 					month_name = dt.strftime("%B")
 		new_name = self.replaceToken( new_name, month_name, '%month_name%')
+
+		new_name = self.replaceToken( new_name, md.genre, '%genre%')
+		new_name = self.replaceToken( new_name, md.language, '%language_code%')
+		new_name = self.replaceToken( new_name, md.criticalRating , '%criticalrating%')
+		new_name = self.replaceToken( new_name, md.alternateSeries, '%alternateseries%')
+		new_name = self.replaceToken( new_name, md.alternateNumber, '%alternatenumber%')
+		new_name = self.replaceToken( new_name, md.alternateCount, '%alternatecount%')
+		new_name = self.replaceToken( new_name, md.imprint, '%imprint%')
+		new_name = self.replaceToken( new_name, md.format, '%format%')
+		new_name = self.replaceToken( new_name, md.maturityRating, '%maturityrating%')
+		new_name = self.replaceToken( new_name, md.storyArc, '%storyarc%')
+		new_name = self.replaceToken( new_name, md.seriesGroup, '%seriesgroup%')
+		new_name = self.replaceToken( new_name, md.scanInfo, '%scaninfo%')
 			
 		if self.smart_cleanup:
 			
diff --git a/settingswindow.ui b/settingswindow.ui
index 8672fd9..4eb4d8a 100644
--- a/settingswindow.ui
+++ b/settingswindow.ui
@@ -449,7 +449,20 @@
            <item row="1" column="1">
             <widget class="QLineEdit" name="leRenameTemplate">
              <property name="toolTip">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The template for the new filename. Accepts the following variables:&lt;/p&gt;&lt;p&gt;%series%&lt;br/&gt;%issue%&lt;br/&gt;%volume%&lt;br/&gt;%issuecount%&lt;br/&gt;%year%&lt;br/&gt;%month%&lt;br/&gt;%month_name%&lt;br/&gt;%publisher%&lt;br/&gt;%title%&lt;/p&gt;&lt;p&gt;Examples:&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;%series% %issue% (%year%)&lt;/span&gt;&lt;br/&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;%series% #%issue% - %title%&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The template for the new filename. Accepts the following variables:&lt;/p&gt;&lt;p&gt;%series%&lt;br/&gt;%issue%&lt;br/&gt;%volume%&lt;br/&gt;%issuecount%&lt;br/&gt;%year%&lt;br/&gt;%month%&lt;br/&gt;%month_name%&lt;br/&gt;%publisher%&lt;br/&gt;%title%&lt;br/&gt;
+%genre%&lt;br/&gt;
+%language_code%&lt;br/&gt;
+%criticalrating%&lt;br/&gt;
+%alternateseries%&lt;br/&gt;
+%alternatenumber%&lt;br/&gt;
+%alternatecount%&lt;br/&gt;
+%imprint%&lt;br/&gt;
+%format%&lt;br/&gt;
+%maturityrating%&lt;br/&gt;
+%storyarc%&lt;br/&gt;
+%seriesgroup%&lt;br/&gt;
+%scaninfo%
+&lt;/p&gt;&lt;p&gt;Examples:&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;%series% %issue% (%year%)&lt;/span&gt;&lt;br/&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;%series% #%issue% - %title%&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
             </widget>
            </item>