diff --git a/src/twig/twig.ts b/src/twig/twig.ts
index 3521550c..86e03d31 100644
--- a/src/twig/twig.ts
+++ b/src/twig/twig.ts
@@ -44,8 +44,9 @@ export const conf: IRichLanguageConfiguration = {
 }
 
 export const language = <ILanguage>{
-	defaultToken: 'invalid',
+	defaultToken: '',
 	tokenPostfix: '',
+	ignoreCase: true,
 
 	keywords: [
 		// (opening) tags
@@ -60,10 +61,13 @@ export const language = <ILanguage>{
 	],
 
 	tokenizer: {
+		...htmlLanguage.tokenizer,
+
 		root: [
 			[/{#/, 'comment.twig', '@commentState'],
 			[/{%[-~]?/, 'delimiter.twig', '@blockState'],
 			[/{{[-~]?/, 'delimiter.twig', '@variableState'],
+			...htmlLanguage.tokenizer.root,
 		],
 
 		/**