diff --git a/ftyperc b/ftyperc
index 74ea491..7cc6dce 100644
--- a/ftyperc
+++ b/ftyperc
@@ -1043,3 +1043,8 @@
 -autoindent
 -syntax terraform
 -c_comment
+
+*.tfvars
+-autoindent
+-syntax terraform
+-c_comment
diff --git a/terraform.jsf b/terraform.jsf
index 5758550..518a8fb 100644
--- a/terraform.jsf
+++ b/terraform.jsf
@@ -131,10 +131,15 @@ done
 
 :ident Idle
 	*		idle		noeat strings
+	"data"		kw
 	"false"		bool
 	"module"	kw
+	"output"	kw
+	"provider"	kw
 	"resource"	kw
+	"terraform"	kw
 	"true"		bool
+	"variable"	kw
 done
 	"a-zA-Z_"	ident