diff --git a/ftdetect/typedb-tql.vim b/ftdetect/typedb-tql.vim
new file mode 100644
index 0000000..97e836b
--- /dev/null
+++ b/ftdetect/typedb-tql.vim
@@ -0,0 +1 @@
+au BufNewFile,BufRead *.tql set filetype=typedb-tql
diff --git a/ftdetect/typeql.vim b/ftdetect/typeql.vim
deleted file mode 100644
index e69de29..0000000
diff --git a/ftplugin/typedb-tql.vim b/ftplugin/typedb-tql.vim
new file mode 100644
index 0000000..9aba802
--- /dev/null
+++ b/ftplugin/typedb-tql.vim
@@ -0,0 +1,3 @@
+set tabstop=4
+set softtabstop=4
+set shiftwidth=4
diff --git a/ftplugin/typeql.vim b/ftplugin/typeql.vim
deleted file mode 100644
index e69de29..0000000
diff --git a/indent/typedb-tql.vim b/indent/typedb-tql.vim
new file mode 100644
index 0000000..821db20
--- /dev/null
+++ b/indent/typedb-tql.vim
@@ -0,0 +1,15 @@
+" Vim indent file
+" Language:     TypeQL for TypeDB
+" Maintainer:   agrski <20504869+agrski@users.noreply.github.com>
+" Created:      2022 Oct 29
+" Last Change:  2022 Oct 29
+
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+" https://psy.swansea.ac.uk/staff/carter/vim/vim_indent.htm
+"
+" define -> dedent to start of line
+" , -> ensure indented to one level beyond last keyword = 1 indent
diff --git a/syntax/typedb-tql.vim b/syntax/typedb-tql.vim
new file mode 100644
index 0000000..2bb6aa5
--- /dev/null
+++ b/syntax/typedb-tql.vim
@@ -0,0 +1,88 @@
+" Vim syntax file
+" Language:     TypeQL for TypeDB
+" Maintainer:   agrski <20504869+agrski@users.noreply.github.com>
+" Created:      2022 Oct 09
+" Last Change:  2022 Oct 29
+
+" Based on the ANTLR grammar defined for TypeQL:
+" https://github.com/vaticle/typeql/blob/fd78c825e87058293290d4801834593823a329a8/grammar/TypeQL.g4
+
+" TODO - make sure to capture of all the below
+" https://github.com/vaticle/typeql/blob/master/grammar/TypeQL.g4
+
+" Prelude {{{1
+if exists("b:current_syntax")
+  finish
+endif
+
+" Syntax matching options {{{1
+syntax case match
+
+setlocal iskeyword+=!
+
+" INPUT TOKEN PATTERNS
+" 0x[0-9a-f]+
+" (labels... again rules to apply)
+"
+" Add matches for various regions
+
+" Keywords {{{1
+syntax keyword typedbTqlNativeType          attribute entity relation role rule thing
+syntax keyword typedbTqlDataType            boolean datetime double long string
+syntax keyword typedbTqlTypeVarConstraint   abstract as @key owns plays regex relates sub sub! then type when
+syntax keyword typedbTqlThingVarConstraint  has iid is isa isa! value
+syntax keyword typedbTqlQueryCmd            compute define delete get insert match undefine
+syntax keyword typedbTqlQueryModifier       asc desc limit offset sort
+syntax keyword typedbTqlAggregateCmd        count group max mean median min std sum
+syntax keyword typedbTqlOperator            not or
+syntax keyword typedbTqlPredicate           != < <= = > >= like
+syntax match   typedbTqlPredicate           /contains/
+
+" Comments {{{1
+syntax keyword typedbTqlTodo contained FIXME NOTE TODO XXX
+syntax match typedbTqlComment /#.*$/ contains=typedbTqlTodo
+
+" Literals {{{1
+syntax keyword  typedbTqlBoolean    false true
+syntax match    typedbTqlString     /".*"/
+syntax match    typedbTqlString     /'.*'/
+syntax match    typedbTqlLong       /\v(\+|-)?[0-9]+/
+syntax match    typedbTqlDouble     /\v(\+|-)?[0-9]+\.[0-9]+/
+syntax match    typedbTqlDate       /\v([0-9]{4}|(\+|-)[0-9]+)-[0-1][0-9]-[0-3][0-9]/
+syntax match    typedbTqlDateTime   /\v([0-9]{4}|(\+|-)[0-9]+)-[0-1][0-9]-[0-3][0-9]T[0-2][0-9]:[0-6][0-9](:[0-6][0-9](\.[0-9]{1,3})?)?/
+
+" Variables {{{1
+syntax match typedbTqlVar /\$_/
+syntax match typedbTqlVar /\$[a-zA-Z0-9][a-zA-Z0-9_-]*/
+
+" Blocks {{{1
+syntax match typedbTqlBlockDelimiter /[{}()]/ contained
+syntax region typedbTqlBlock
+      \ start='{'
+      \ end='}'
+      \ contains=typedbTqlVar,typedbTqlThingVarConstraint,typedbTqlBlockDelimiter
+      \ fold transparent
+
+" Default highlighting {{{1
+highlight default link typedbTqlNativeType          Identifier
+highlight default link typedbTqlDataType            Type
+highlight default link typedbTqlTypeVarConstraint   Statement
+highlight default link typedbTqlThingVarConstraint  Operator
+highlight default link typedbTqlQueryCmd            Statement
+highlight default link typedbTqlQueryModifier       Statement
+highlight default link typedbTqlAggregateCmd        Statement
+highlight default link typedbTqlOperator            Operator
+highlight default link typedbTqlPredicate           Operator
+
+highlight default link typedbTqlTodo                Todo
+highlight default link typedbTqlComment             Comment
+
+highlight default link typedbTqlVar                 Identifier
+highlight default link typedbTqlBlockDelimiter      Structure
+
+highlight default link typedbTqlBoolean             Boolean
+highlight default link typedbTqlString              String
+highlight default link typedbTqlLong                Number
+highlight default link typedbTqlDouble              Float
+highlight default link typedbTqlDate                Constant
+highlight default link typedbTqlDateTime            Constant
diff --git a/syntax/typeql.vim b/syntax/typeql.vim
deleted file mode 100644
index e69de29..0000000