diff --git a/internal/code-generator/generator/heuristics.go b/internal/code-generator/generator/heuristics.go
index 077b4b8..f0ddedf 100644
--- a/internal/code-generator/generator/heuristics.go
+++ b/internal/code-generator/generator/heuristics.go
@@ -299,7 +299,7 @@ func getHeuristics(line string) []*heuristic {
 		}
 
 		if reg != "" {
-			reg = convToValidRegexp(reg)
+			reg = convertToValidRegexp(reg)
 			heuristics = append(heuristics, &heuristic{Regexp: reg})
 		}
 	}
@@ -327,7 +327,7 @@ func replaceRegexpVariables(reg string) string {
 	return repl
 }
 
-func convToValidRegexp(reg string) string {
+func convertToValidRegexp(reg string) string {
 	// example: `/^(\s*)(<Project|<Import|<Property|<?xml|xmlns)/i``
 	// Ruby modifier "m" matches multiple lines, recognizing newlines as normal characters, Go use flag "s" for that.
 	const (
diff --git a/internal/code-generator/generator/test_files/content.gold b/internal/code-generator/generator/test_files/content.gold
index e2de7f8..608b4fa 100644
--- a/internal/code-generator/generator/test_files/content.gold
+++ b/internal/code-generator/generator/test_files/content.gold
@@ -34,6 +34,53 @@ var matchers = map[string]languageMatcher{
 
 		return OtherLanguage, false
 	},
+	".f": func(i []byte) (string, bool) {
+		if f_Forth_Matcher_0.Match(i) {
+			return "Forth", true
+		} else if f_FilebenchWML_Matcher_0.Match(i) {
+			return "Filebench WML", true
+		} else if f_FORTRAN_Matcher_0.Match(i) {
+			return "FORTRAN", true
+		}
+
+		return OtherLanguage, false
+	},
+	".h": func(i []byte) (string, bool) {
+		if h_ObjectiveDashC_Matcher_0.Match(i) {
+			return "Objective-C", true
+		} else if h_CPlusPlus_Matcher_0.Match(i) || h_CPlusPlus_Matcher_1.Match(i) || h_CPlusPlus_Matcher_2.Match(i) || h_CPlusPlus_Matcher_3.Match(i) || h_CPlusPlus_Matcher_4.Match(i) || h_CPlusPlus_Matcher_5.Match(i) || h_CPlusPlus_Matcher_6.Match(i) {
+			return "C++", true
+		}
+
+		return OtherLanguage, false
+	},
+	".lsp": func(i []byte) (string, bool) {
+		if lsp_CommonLisp_Matcher_0.Match(i) {
+			return "Common Lisp", true
+		} else if lsp_NewLisp_Matcher_0.Match(i) {
+			return "NewLisp", true
+		}
+
+		return OtherLanguage, false
+	},
+	".lisp": func(i []byte) (string, bool) {
+		if lisp_CommonLisp_Matcher_0.Match(i) {
+			return "Common Lisp", true
+		} else if lisp_NewLisp_Matcher_0.Match(i) {
+			return "NewLisp", true
+		}
+
+		return OtherLanguage, false
+	},
+	".md": func(i []byte) (string, bool) {
+		if md_Markdown_Matcher_0.Match(i) || md_Markdown_Matcher_1.Match(i) {
+			return "Markdown", true
+		} else if md_GCCmachinedescription_Matcher_0.Match(i) {
+			return "GCC machine description", true
+		}
+
+		return "Markdown", true
+	},
 	".ms": func(i []byte) (string, bool) {
 		if ms_Groff_Matcher_0.Match(i) {
 			return "Groff", true
@@ -63,19 +110,45 @@ var matchers = map[string]languageMatcher{
 
 		return OtherLanguage, false
 	},
+	".rpy": func(i []byte) (string, bool) {
+		if rpy_Python_Matcher_0.Match(i) {
+			return "Python", true
+		}
+
+		return "Ren'Py", true
+	},
 }
 
 var (
-	asc_PublicKey_Matcher_0   = regexp.MustCompile(`(?m)^(----[- ]BEGIN|ssh-(rsa|dss)) `)
-	asc_AsciiDoc_Matcher_0    = regexp.MustCompile(`(?m)^[=-]+(\s|\n)|{{[A-Za-z]`)
-	asc_AGSScript_Matcher_0   = regexp.MustCompile(`(?m)^(\/\/.+|((import|export)\s+)?(function|int|float|char)\s+((room|repeatedly|on|game)_)?([A-Za-z]+[A-Za-z_0-9]+)\s*[;\(])`)
-	ms_Groff_Matcher_0        = regexp.MustCompile(`(?mi)^[.'][a-z][a-z](\s|$)`)
-	mod_XML_Matcher_0         = regexp.MustCompile(`(?m)<!ENTITY `)
-	mod_ModulaDash2_Matcher_0 = regexp.MustCompile(`(?mi)^\s*MODULE [\w\.]+;`)
-	mod_ModulaDash2_Matcher_1 = regexp.MustCompile(`(?mi)^\s*END [\w\.]+;`)
-	pro_Prolog_Matcher_0      = regexp.MustCompile(`(?m)^[^#]+:-`)
-	pro_INI_Matcher_0         = regexp.MustCompile(`(?m)last_client=`)
-	pro_QMake_Matcher_0       = regexp.MustCompile(`(?m)HEADERS`)
-	pro_QMake_Matcher_1       = regexp.MustCompile(`(?m)SOURCES`)
-	pro_IDL_Matcher_0         = regexp.MustCompile(`(?m)^\s*function[ \w,]+$`)
+	asc_PublicKey_Matcher_0            = regexp.MustCompile(`(?m)^(----[- ]BEGIN|ssh-(rsa|dss)) `)
+	asc_AsciiDoc_Matcher_0             = regexp.MustCompile(`(?m)^[=-]+(\s|\n)|{{[A-Za-z]`)
+	asc_AGSScript_Matcher_0            = regexp.MustCompile(`(?m)^(\/\/.+|((import|export)\s+)?(function|int|float|char)\s+((room|repeatedly|on|game)_)?([A-Za-z]+[A-Za-z_0-9]+)\s*[;\(])`)
+	f_Forth_Matcher_0                  = regexp.MustCompile(`(?m)^: `)
+	f_FilebenchWML_Matcher_0           = regexp.MustCompile(`(?m)flowop`)
+	f_FORTRAN_Matcher_0                = regexp.MustCompile(`(?mi)^([c*][^abd-z]|      (subroutine|program|end|data)\s|\s*!)`)
+	h_ObjectiveDashC_Matcher_0         = regexp.MustCompile(`(?m)^\s*(@(interface|class|protocol|property|end|synchronised|selector|implementation)\b|#import\s+.+\.h[">])`)
+	h_CPlusPlus_Matcher_0              = regexp.MustCompile(`(?m)^\s*#\s*include <(cstdint|string|vector|map|list|array|bitset|queue|stack|forward_list|unordered_map|unordered_set|(i|o|io)stream)>`)
+	h_CPlusPlus_Matcher_1              = regexp.MustCompile(`(?m)^\s*template\s*<`)
+	h_CPlusPlus_Matcher_2              = regexp.MustCompile(`(?m)^[ \t]*try`)
+	h_CPlusPlus_Matcher_3              = regexp.MustCompile(`(?m)^[ \t]*catch\s*\(`)
+	h_CPlusPlus_Matcher_4              = regexp.MustCompile(`(?m)^[ \t]*(class|(using[ \t]+)?namespace)\s+\w+`)
+	h_CPlusPlus_Matcher_5              = regexp.MustCompile(`(?m)^[ \t]*(private|public|protected):$`)
+	h_CPlusPlus_Matcher_6              = regexp.MustCompile(`(?m)std::\w+`)
+	lsp_CommonLisp_Matcher_0           = regexp.MustCompile(`(?mi)^\s*\((defun|in-package|defpackage) `)
+	lsp_NewLisp_Matcher_0              = regexp.MustCompile(`(?m)^\s*\(define `)
+	lisp_CommonLisp_Matcher_0          = regexp.MustCompile(`(?mi)^\s*\((defun|in-package|defpackage) `)
+	lisp_NewLisp_Matcher_0             = regexp.MustCompile(`(?m)^\s*\(define `)
+	md_Markdown_Matcher_0              = regexp.MustCompile(`(?mi)(^[-a-z0-9=#!\*\[|>])|<\/`)
+	md_Markdown_Matcher_1              = regexp.MustCompile(`(?m)^$`)
+	md_GCCmachinedescription_Matcher_0 = regexp.MustCompile(`(?m)^(;;|\(define_)`)
+	ms_Groff_Matcher_0                 = regexp.MustCompile(`(?mi)^[.'][a-z][a-z](\s|$)`)
+	mod_XML_Matcher_0                  = regexp.MustCompile(`(?m)<!ENTITY `)
+	mod_ModulaDash2_Matcher_0          = regexp.MustCompile(`(?mi)^\s*MODULE [\w\.]+;`)
+	mod_ModulaDash2_Matcher_1          = regexp.MustCompile(`(?mi)^\s*END [\w\.]+;`)
+	pro_Prolog_Matcher_0               = regexp.MustCompile(`(?m)^[^#]+:-`)
+	pro_INI_Matcher_0                  = regexp.MustCompile(`(?m)last_client=`)
+	pro_QMake_Matcher_0                = regexp.MustCompile(`(?m)HEADERS`)
+	pro_QMake_Matcher_1                = regexp.MustCompile(`(?m)SOURCES`)
+	pro_IDL_Matcher_0                  = regexp.MustCompile(`(?m)^\s*function[ \w,]+$`)
+	rpy_Python_Matcher_0               = regexp.MustCompile(`(?ms)(^(import|from|class|def)\s)`)
 )
diff --git a/internal/code-generator/generator/test_files/heuristics.test.rb b/internal/code-generator/generator/test_files/heuristics.test.rb
index d33d857..1bfc223 100644
--- a/internal/code-generator/generator/test_files/heuristics.test.rb
+++ b/internal/code-generator/generator/test_files/heuristics.test.rb
@@ -11,6 +11,45 @@
       end
     end
 
+    fortran_rx = /^([c*][^abd-z]|      (subroutine|program|end|data)\s|\s*!)/i
+
+    disambiguate ".f" do |data|
+      if /^: /.match(data)
+        Language["Forth"]
+      elsif data.include?("flowop")
+        Language["Filebench WML"]
+      elsif fortran_rx.match(data)
+        Language["FORTRAN"]
+      end
+    end
+
+    disambiguate ".h" do |data|
+      if ObjectiveCRegex.match(data)
+        Language["Objective-C"]
+      elsif (/^\s*#\s*include <(cstdint|string|vector|map|list|array|bitset|queue|stack|forward_list|unordered_map|unordered_set|(i|o|io)stream)>/.match(data) ||
+        /^\s*template\s*</.match(data) || /^[ \t]*try/.match(data) || /^[ \t]*catch\s*\(/.match(data) || /^[ \t]*(class|(using[ \t]+)?namespace)\s+\w+/.match(data) || /^[ \t]*(private|public|protected):$/.match(data) || /std::\w+/.match(data))
+        Language["C++"]
+      end
+    end
+
+    disambiguate ".lsp", ".lisp" do |data|
+      if /^\s*\((defun|in-package|defpackage) /i.match(data)
+        Language["Common Lisp"]
+      elsif /^\s*\(define /.match(data)
+        Language["NewLisp"]
+      end
+    end
+
+    disambiguate ".md" do |data|
+      if /(^[-a-z0-9=#!\*\[|>])|<\//i.match(data) || data.empty?
+        Language["Markdown"]
+      elsif /^(;;|\(define_)/.match(data)
+        Language["GCC machine description"]
+      else
+        Language["Markdown"]
+      end
+    end
+
     disambiguate ".ms" do |data|
       if /^[.'][a-z][a-z](\s|$)/i.match(data)
         Language["Groff"]
@@ -42,3 +81,11 @@
         Language["IDL"]
       end
     end
+
+    disambiguate ".rpy" do |data|
+      if /(^(import|from|class|def)\s)/m.match(data)
+        Language["Python"]
+      else
+        Language["Ren'Py"]
+      end
+    end