diff --git a/main.py b/main.py
index c85fec7ef1d639869dfba960bc807502357e8db5..f9ed43229349ed818cc98ec2ff78ef1bc61dbb3c 100644
--- a/main.py
+++ b/main.py
@@ -25,7 +25,14 @@ logger = init_logging.get_logger(__name__)
 
 
 defense_choices = ['A', 'Ev', 'En', 'A/Ev', 'Ev/En', 'A/En']
-weapon_choices = ['Bows', 'Quivers', 'Sceptres', 'Wands', 'Shields']
+weapon_choices = [
+    'OneHandMaces', 'TwoHandMaces',
+    'OneHandAxes', 'TwoHandAxes',
+    'Daggers', 'Claws',
+    'Bows', 'Quivers',
+    'Sceptres', 'Wands',
+    'Shields'
+]
 
 
 def run_filter_generation():
@@ -59,6 +66,7 @@ def run_filter_generation():
         # No help arg passed. Continue with actual filter generation.
         generate_filter(args)
 
+
 def generate_filter(args ,test_mode=False):
     """
     Logic to actually generate filter file.
@@ -113,9 +121,11 @@ def generate_filter(args ,test_mode=False):
     parse_num = 0
     with open('generated_filters/{0}'.format(file_name), "w") as filter_file:
         filter_file.write('\n')
-        filter_file.write('# ======================= #\n')
-        filter_file.write('# === POE Loot Filter === #\n')
-        filter_file.write('# ======================= #\n')
+        filter_file.write('#==============================#\n')
+        filter_file.write('# Waffyblade - POE Loot Filter #\n')
+        filter_file.write('#==============================#\n')
+        filter_file.write('#\n#\n')
+        filter_file.write('# Focuses on simplified drops, compared to other filters like Neversink Filterblade.')
         filter_file.write('#\n#\n')
         filter_file.write('# Generated with:\n')
         filter_file.write('#     Base Drop Level: {0}\n'.format(base_drop_level))
diff --git a/resources/parsers/table_of_contents.py b/resources/parsers/table_of_contents.py
index d61d16a8a29ff4e85494acab1e0ba106368ae725..72fb6957de9f15cc092b66425cf019cbc18dea88 100644
--- a/resources/parsers/table_of_contents.py
+++ b/resources/parsers/table_of_contents.py
@@ -116,6 +116,33 @@ class TableOfContentsGenerator():
         self.filter_file.write('# [{0}] - Weapons\n'.format(str(parse_num).zfill(3)))
 
         parse_subnum = 0
+        if 'OneHandMaces' in self.weapon_types:
+            parse_subnum += 1
+            self.filter_file.write('# [{0}.{1}] - One Handed Maces\n'.format(str(parse_num).zfill(3), str(parse_subnum).zfill(2)))
+
+        if 'TwoHandMaces' in self.weapon_types:
+            parse_subnum += 1
+            self.filter_file.write('# [{0}.{1}] - Two Handed Maces\n'.format(str(parse_num).zfill(3), str(parse_subnum).zfill(2)))
+
+        if 'OneHandAxes' in self.weapon_types:
+            parse_subnum += 1
+            self.filter_file.write('# [{0}.{1}] - One Handed Axes\n'.format(str(parse_num).zfill(3), str(parse_subnum).zfill(2)))
+
+        if 'TwoHandAxes' in self.weapon_types:
+            parse_subnum += 1
+            self.filter_file.write(
+                '# [{0}.{1}] - Two Handed Axes\n'.format(str(parse_num).zfill(3), str(parse_subnum).zfill(2)))
+
+        if 'Daggers' in self.weapon_types:
+            parse_subnum += 1
+            self.filter_file.write(
+                '# [{0}.{1}] - Daggers\n'.format(str(parse_num).zfill(3), str(parse_subnum).zfill(2)))
+
+        if 'Claws' in self.weapon_types:
+            parse_subnum += 1
+            self.filter_file.write(
+                '# [{0}.{1}] - Claws\n'.format(str(parse_num).zfill(3), str(parse_subnum).zfill(2)))
+
         if 'Bows' in self.weapon_types:
             parse_subnum += 1
             self.filter_file.write('# [{0}.{1}] - Bows\n'.format(str(parse_num).zfill(3), str(parse_subnum).zfill(2)))