diff --git a/data/DataType/byte_kotlin.yaml b/data/DataType/byte_kotlin.yaml
new file mode 100644
index 0000000..726040c
--- /dev/null
+++ b/data/DataType/byte_kotlin.yaml
@@ -0,0 +1,4 @@
+keyword: byte
+integer-min: '-128'
+integer-max: '127'
+integer-signed: true
diff --git a/data/DataType/double_kotlin.yaml b/data/DataType/double_kotlin.yaml
new file mode 100644
index 0000000..4bd1e36
--- /dev/null
+++ b/data/DataType/double_kotlin.yaml
@@ -0,0 +1,4 @@
+keyword: double
+integer-min: 'uncertain'
+integer-max: 'uncertain'
+integer-signed: true
diff --git a/data/DataType/float_kotlin.yaml b/data/DataType/float_kotlin.yaml
new file mode 100644
index 0000000..a800840
--- /dev/null
+++ b/data/DataType/float_kotlin.yaml
@@ -0,0 +1,4 @@
+keyword: float
+integer-min: 'uncertain'
+integer-max: 'uncertain'
+integer-signed: true
diff --git a/data/DataType/int_kotlin.yaml b/data/DataType/int_kotlin.yaml
new file mode 100644
index 0000000..dd38bb1
--- /dev/null
+++ b/data/DataType/int_kotlin.yaml
@@ -0,0 +1,4 @@
+keyword: int
+integer-min: '-2147483648'
+integer-max: '2147483647'
+integer-signed: true
diff --git a/data/DataType/long_kotlin.yaml b/data/DataType/long_kotlin.yaml
new file mode 100644
index 0000000..5bef6fa
--- /dev/null
+++ b/data/DataType/long_kotlin.yaml
@@ -0,0 +1,4 @@
+keyword: long
+integer-min: '-9223372036854775808'
+integer-max: '9223372036854775807'
+integer-signed: true
diff --git a/data/DataType/short_kotlin.yaml b/data/DataType/short_kotlin.yaml
new file mode 100644
index 0000000..8a2f82a
--- /dev/null
+++ b/data/DataType/short_kotlin.yaml
@@ -0,0 +1,4 @@
+keyword: short
+integer-min: '-32768'
+integer-max: '32767'
+integer-signed: true
diff --git a/data/Delimiter/kotlin_char.yaml b/data/Delimiter/kotlin_char.yaml
new file mode 100644
index 0000000..d0dc67a
--- /dev/null
+++ b/data/Delimiter/kotlin_char.yaml
@@ -0,0 +1,5 @@
+type: string
+start: "'"
+end: "'"
+escape: \
+length: 1
diff --git a/data/Language/Kotlin.yaml b/data/Language/Kotlin.yaml
new file mode 100644
index 0000000..a488ed0
--- /dev/null
+++ b/data/Language/Kotlin.yaml
@@ -0,0 +1,96 @@
+identifier: Kotlin
+wikidata: Q3816639
+grammar_file: https://github.com/antlr/grammars-v4/tree/master/kotlin
+extensions:
+  - kt
+  - ktm
+  - kts
+delimiters:
+  # comment delimiters
+  - double_slash
+  - multiline_slash_star
+  # string delimiters
+  - kotlin_char
+  - double_quote_slash_escape
+  - curly_braces
+datatypes:
+  - bool_title_case
+  - byte_kotlin
+  - short_kotlin
+  - int_kotlin
+  - long_kotlin
+  - float_kotlin
+  - double_kotlin
+keywords:
+  - abstract
+  - actual
+  - annotation
+  - as
+  - break
+  - by
+  - catch
+  - class
+  - companion
+  - const
+  - constructor
+  - continue
+  - crossinline
+  - data
+  - delegate
+  - do
+  - dynamic
+  - else
+  - enum
+  - expect
+  - external
+  - field
+  - file
+  - final
+  - finally
+  - for
+  - fun
+  - get
+  - if
+  - import
+  - in
+  - infix
+  - init
+  - inline
+  - inner
+  - interface
+  - internal
+  - is
+  - it
+  - lateinit
+  - noinline
+  - null
+  - object
+  - open
+  - operator
+  - out
+  - override
+  - package
+  - param
+  - private
+  - property
+  - protected
+  - public
+  - receiveris
+  - reified
+  - return
+  - sealed
+  - set
+  - setparam
+  - super
+  - suspend
+  - tailrec
+  - this
+  - throw
+  - try
+  - typealias
+  - val
+  - var
+  - vararg
+  - when
+  - where
+  - while