diff --git a/UltiSnips/css.snippets b/UltiSnips/css.snippets
index 5eb7046..000989f 100644
--- a/UltiSnips/css.snippets
+++ b/UltiSnips/css.snippets
@@ -262,3 +262,7 @@ endsnippet
 snippet v "var(--...)"
 var(--$0)
 endsnippet
+
+snippet ftscss "/* vim: set filetype=scss: */"
+/* vim: set filetype=scss: */
+endsnippet
diff --git a/UltiSnips/html.snippets b/UltiSnips/html.snippets
index 8b5630a..9bf3f52 100644
--- a/UltiSnips/html.snippets
+++ b/UltiSnips/html.snippets
@@ -35,3 +35,7 @@ endsnippet
 snippet tagi "wrap with tag inline"
 <$1$0>${VISUAL}</$1>
 endsnippet
+
+snippet ftphp "<!-- vim: set filetype=php -->"
+<!-- vim: set filetype=php: -->
+endsnippet
diff --git a/UltiSnips/php.snippets b/UltiSnips/php.snippets
index c524c6f..ae7a4e2 100644
--- a/UltiSnips/php.snippets
+++ b/UltiSnips/php.snippets
@@ -1,3 +1,5 @@
+extends html
+
 snippet if "if () {}"
 if ($1) {
 	$0
diff --git a/after/ftdetect/octobercms.vim b/after/ftdetect/octobercms.vim
deleted file mode 100644
index 7de87ef..0000000
--- a/after/ftdetect/octobercms.vim
+++ /dev/null
@@ -1 +0,0 @@
-au BufNewFile,BufRead *.htm set filetype=octobercms