diff --git a/themes/base16-measured-dark.toml b/themes/base16-measured-dark.toml
new file mode 100644
index 0000000..2ec7f8e
--- /dev/null
+++ b/themes/base16-measured-dark.toml
@@ -0,0 +1,92 @@
+# Scheme name: Measured Dark
+# Scheme author: Measured (https://measured.co)
+# Template author: Tinted Theming (https://github.com/tinted-theming)
+
+"attributes" = "base09"
+"comment" = { fg = "base03", modifiers = ["italic"] }
+"constant" = "base09"
+"constant.character.escape" = "base0C"
+"constant.numeric" = "base09"
+"constructor" = "base0D"
+"debug" = "base03"
+"diagnostic" = { modifiers = ["underlined"] }
+"diff.delta" = "base09"
+"diff.minus" = "base08"
+"diff.plus" = "base0B"
+"error" = "base08"
+"function" = "base0D"
+"hint" = "base03"
+"info" = "base0D"
+"keyword" = "base0E"
+"label" = "base0E"
+"namespace" = "base0E"
+"operator" = "base05"
+"special" = "base0D"
+"string"  = "base0B"
+"type" = "base0A"
+"variable" = "base08"
+"variable.other.member" = "base0B"
+"warning" = "base09"
+
+"markup.bold" = { fg = "base0A", modifiers = ["bold"] }
+"markup.heading" = "base0D"
+"markup.italic" = { fg = "base0E", modifiers = ["italic"] }
+"markup.link.text" = "base08"
+"markup.link.url" = { fg = "base09", modifiers = ["underlined"] }
+"markup.list" = "base08"
+"markup.quote" = "base0C"
+"markup.raw" = "base0B"
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
+
+"diagnostic.hint" = { underline = { style = "curl" } }
+"diagnostic.info" = { underline = { style = "curl" } }
+"diagnostic.warning" = { underline = { style = "curl" } }
+"diagnostic.error" = { underline = { style = "curl" } }
+
+"ui.background" = { bg = "base00" }
+"ui.bufferline.active" = { fg = "base00", bg = "base03", modifiers = ["bold"] }
+"ui.bufferline" = { fg = "base04", bg = "base00" }
+"ui.cursor" = { fg = "base0A", modifiers = ["reversed"] }
+"ui.cursor.insert" = { fg = "base0A", modifiers = ["reversed"] }
+"ui.cursorline.primary" = { fg = "base05", bg = "base01" }
+"ui.cursor.match" = { fg = "base0A", modifiers = ["reversed"] }
+"ui.cursor.select" = { fg = "base0A", modifiers = ["reversed"] }
+"ui.gutter" = { bg = "base00" }
+"ui.help" = { fg = "base06", bg = "base01" }
+"ui.linenr" = { fg = "base03", bg = "base00" }
+"ui.linenr.selected" = { fg = "base04", bg = "base01", modifiers = ["bold"] }
+"ui.menu" = { fg = "base05", bg = "base01" }
+"ui.menu.scroll" = { fg = "base03", bg = "base01" }
+"ui.menu.selected" = { fg = "base01", bg = "base04" }
+"ui.popup" = { bg = "base01" }
+"ui.selection" = { bg = "base02" }
+"ui.selection.primary" = { bg = "base02" }
+"ui.statusline" = { fg = "base04", bg = "base01" }
+"ui.statusline.inactive" = { bg = "base01", fg = "base03" }
+"ui.statusline.insert" = { fg = "base00", bg = "base0B" }
+"ui.statusline.normal" = { fg = "base00", bg = "base03" }
+"ui.statusline.select" = { fg = "base00", bg = "base0F" }
+"ui.text" = "base05"
+"ui.text.focus" = "base05"
+"ui.virtual.indent-guide" = { fg = "base03" }
+"ui.virtual.inlay-hint" = { fg = "base01" }
+"ui.virtual.ruler" = { bg = "base01" }
+"ui.window" = { bg = "base01" }
+
+[palette]
+base00 = "#00211f" # Default Background
+base01 = "#003a38" # Lighter Background (Used for status bars, line number and folding marks)
+base02 = "#005453" # Selection Background
+base03 = "#ababab" # Comments, Invisibles, Line Highlighting
+base04 = "#c3c3c3" # Dark Foreground (Used for status bars)
+base05 = "#dcdcdc" # Default Foreground, Caret, Delimiters, Operators
+base06 = "#efefef" # Light Foreground (Not often used)
+base07 = "#f5f5f5" # Light Background (Not often used)
+base08 = "#ce7e8e" # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
+base09 = "#dca37c" # Integers, Boolean, Constants, XML Attributes, Markup Link Url
+base0A = "#bfac4e" # Classes, Markup Bold, Search Text Background
+base0B = "#56c16f" # Strings, Inherited Class, Markup Code, Diff Inserted
+base0C = "#62c0be" # Support, Regular Expressions, Escape Characters, Markup Quotes
+base0D = "#88b0da" # Functions, Methods, Attribute IDs, Headings
+base0E = "#b39be0" # Keywords, Storage, Selector, Markup Italic, Diff Changed
+base0F = "#d89aba" # Deprecated, Opening/Closing Embedded Language Tags, e.g. <?php ?>
diff --git a/themes/base16-measured-light.toml b/themes/base16-measured-light.toml
new file mode 100644
index 0000000..2909cd2
--- /dev/null
+++ b/themes/base16-measured-light.toml
@@ -0,0 +1,92 @@
+# Scheme name: Measured Light
+# Scheme author: Measured (https://measured.co)
+# Template author: Tinted Theming (https://github.com/tinted-theming)
+
+"attributes" = "base09"
+"comment" = { fg = "base03", modifiers = ["italic"] }
+"constant" = "base09"
+"constant.character.escape" = "base0C"
+"constant.numeric" = "base09"
+"constructor" = "base0D"
+"debug" = "base03"
+"diagnostic" = { modifiers = ["underlined"] }
+"diff.delta" = "base09"
+"diff.minus" = "base08"
+"diff.plus" = "base0B"
+"error" = "base08"
+"function" = "base0D"
+"hint" = "base03"
+"info" = "base0D"
+"keyword" = "base0E"
+"label" = "base0E"
+"namespace" = "base0E"
+"operator" = "base05"
+"special" = "base0D"
+"string"  = "base0B"
+"type" = "base0A"
+"variable" = "base08"
+"variable.other.member" = "base0B"
+"warning" = "base09"
+
+"markup.bold" = { fg = "base0A", modifiers = ["bold"] }
+"markup.heading" = "base0D"
+"markup.italic" = { fg = "base0E", modifiers = ["italic"] }
+"markup.link.text" = "base08"
+"markup.link.url" = { fg = "base09", modifiers = ["underlined"] }
+"markup.list" = "base08"
+"markup.quote" = "base0C"
+"markup.raw" = "base0B"
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
+
+"diagnostic.hint" = { underline = { style = "curl" } }
+"diagnostic.info" = { underline = { style = "curl" } }
+"diagnostic.warning" = { underline = { style = "curl" } }
+"diagnostic.error" = { underline = { style = "curl" } }
+
+"ui.background" = { bg = "base00" }
+"ui.bufferline.active" = { fg = "base00", bg = "base03", modifiers = ["bold"] }
+"ui.bufferline" = { fg = "base04", bg = "base00" }
+"ui.cursor" = { fg = "base0A", modifiers = ["reversed"] }
+"ui.cursor.insert" = { fg = "base0A", modifiers = ["reversed"] }
+"ui.cursorline.primary" = { fg = "base05", bg = "base01" }
+"ui.cursor.match" = { fg = "base0A", modifiers = ["reversed"] }
+"ui.cursor.select" = { fg = "base0A", modifiers = ["reversed"] }
+"ui.gutter" = { bg = "base00" }
+"ui.help" = { fg = "base06", bg = "base01" }
+"ui.linenr" = { fg = "base03", bg = "base00" }
+"ui.linenr.selected" = { fg = "base04", bg = "base01", modifiers = ["bold"] }
+"ui.menu" = { fg = "base05", bg = "base01" }
+"ui.menu.scroll" = { fg = "base03", bg = "base01" }
+"ui.menu.selected" = { fg = "base01", bg = "base04" }
+"ui.popup" = { bg = "base01" }
+"ui.selection" = { bg = "base02" }
+"ui.selection.primary" = { bg = "base02" }
+"ui.statusline" = { fg = "base04", bg = "base01" }
+"ui.statusline.inactive" = { bg = "base01", fg = "base03" }
+"ui.statusline.insert" = { fg = "base00", bg = "base0B" }
+"ui.statusline.normal" = { fg = "base00", bg = "base03" }
+"ui.statusline.select" = { fg = "base00", bg = "base0F" }
+"ui.text" = "base05"
+"ui.text.focus" = "base05"
+"ui.virtual.indent-guide" = { fg = "base03" }
+"ui.virtual.inlay-hint" = { fg = "base01" }
+"ui.virtual.ruler" = { bg = "base01" }
+"ui.window" = { bg = "base01" }
+
+[palette]
+base00 = "#fdf9f5" # Default Background
+base01 = "#f9f5f1" # Lighter Background (Used for status bars, line number and folding marks)
+base02 = "#ffeada" # Selection Background
+base03 = "#5a5a5a" # Comments, Invisibles, Line Highlighting
+base04 = "#404040" # Dark Foreground (Used for status bars)
+base05 = "#292929" # Default Foreground, Caret, Delimiters, Operators
+base06 = "#181818" # Light Foreground (Not often used)
+base07 = "#000000" # Light Background (Not often used)
+base08 = "#ac1f35" # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
+base09 = "#ad5601" # Integers, Boolean, Constants, XML Attributes, Markup Link Url
+base0A = "#645a00" # Classes, Markup Bold, Search Text Background
+base0B = "#0c680c" # Strings, Inherited Class, Markup Code, Diff Inserted
+base0C = "#01716f" # Support, Regular Expressions, Escape Characters, Markup Quotes
+base0D = "#0158ad" # Functions, Methods, Attribute IDs, Headings
+base0E = "#6645c2" # Keywords, Storage, Selector, Markup Italic, Diff Changed
+base0F = "#a81a66" # Deprecated, Opening/Closing Embedded Language Tags, e.g. <?php ?>
diff --git a/themes/base16-saga.toml b/themes/base16-saga.toml
new file mode 100644
index 0000000..0f3349c
--- /dev/null
+++ b/themes/base16-saga.toml
@@ -0,0 +1,92 @@
+# Scheme name: SAGA
+# Scheme author: https://github.com/SAGAtheme/SAGA
+# Template author: Tinted Theming (https://github.com/tinted-theming)
+
+"attributes" = "base09"
+"comment" = { fg = "base03", modifiers = ["italic"] }
+"constant" = "base09"
+"constant.character.escape" = "base0C"
+"constant.numeric" = "base09"
+"constructor" = "base0D"
+"debug" = "base03"
+"diagnostic" = { modifiers = ["underlined"] }
+"diff.delta" = "base09"
+"diff.minus" = "base08"
+"diff.plus" = "base0B"
+"error" = "base08"
+"function" = "base0D"
+"hint" = "base03"
+"info" = "base0D"
+"keyword" = "base0E"
+"label" = "base0E"
+"namespace" = "base0E"
+"operator" = "base05"
+"special" = "base0D"
+"string"  = "base0B"
+"type" = "base0A"
+"variable" = "base08"
+"variable.other.member" = "base0B"
+"warning" = "base09"
+
+"markup.bold" = { fg = "base0A", modifiers = ["bold"] }
+"markup.heading" = "base0D"
+"markup.italic" = { fg = "base0E", modifiers = ["italic"] }
+"markup.link.text" = "base08"
+"markup.link.url" = { fg = "base09", modifiers = ["underlined"] }
+"markup.list" = "base08"
+"markup.quote" = "base0C"
+"markup.raw" = "base0B"
+"markup.strikethrough" = { modifiers = ["crossed_out"] }
+
+"diagnostic.hint" = { underline = { style = "curl" } }
+"diagnostic.info" = { underline = { style = "curl" } }
+"diagnostic.warning" = { underline = { style = "curl" } }
+"diagnostic.error" = { underline = { style = "curl" } }
+
+"ui.background" = { bg = "base00" }
+"ui.bufferline.active" = { fg = "base00", bg = "base03", modifiers = ["bold"] }
+"ui.bufferline" = { fg = "base04", bg = "base00" }
+"ui.cursor" = { fg = "base0A", modifiers = ["reversed"] }
+"ui.cursor.insert" = { fg = "base0A", modifiers = ["reversed"] }
+"ui.cursorline.primary" = { fg = "base05", bg = "base01" }
+"ui.cursor.match" = { fg = "base0A", modifiers = ["reversed"] }
+"ui.cursor.select" = { fg = "base0A", modifiers = ["reversed"] }
+"ui.gutter" = { bg = "base00" }
+"ui.help" = { fg = "base06", bg = "base01" }
+"ui.linenr" = { fg = "base03", bg = "base00" }
+"ui.linenr.selected" = { fg = "base04", bg = "base01", modifiers = ["bold"] }
+"ui.menu" = { fg = "base05", bg = "base01" }
+"ui.menu.scroll" = { fg = "base03", bg = "base01" }
+"ui.menu.selected" = { fg = "base01", bg = "base04" }
+"ui.popup" = { bg = "base01" }
+"ui.selection" = { bg = "base02" }
+"ui.selection.primary" = { bg = "base02" }
+"ui.statusline" = { fg = "base04", bg = "base01" }
+"ui.statusline.inactive" = { bg = "base01", fg = "base03" }
+"ui.statusline.insert" = { fg = "base00", bg = "base0B" }
+"ui.statusline.normal" = { fg = "base00", bg = "base03" }
+"ui.statusline.select" = { fg = "base00", bg = "base0F" }
+"ui.text" = "base05"
+"ui.text.focus" = "base05"
+"ui.virtual.indent-guide" = { fg = "base03" }
+"ui.virtual.inlay-hint" = { fg = "base01" }
+"ui.virtual.ruler" = { bg = "base01" }
+"ui.window" = { bg = "base01" }
+
+[palette]
+base00 = "#05080a" # Default Background
+base01 = "#0a1014" # Lighter Background (Used for status bars, line number and folding marks)
+base02 = "#0f181e" # Selection Background
+base03 = "#141f27" # Comments, Invisibles, Line Highlighting
+base04 = "#192630" # Dark Foreground (Used for status bars)
+base05 = "#dce2f7" # Default Foreground, Caret, Delimiters, Operators
+base06 = "#f8eae7" # Light Foreground (Not often used)
+base07 = "#ccd3fe" # Light Background (Not often used)
+base08 = "#ffd4e9" # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
+base09 = "#fbcbae" # Integers, Boolean, Constants, XML Attributes, Markup Link Url
+base0A = "#fbebc8" # Classes, Markup Bold, Search Text Background
+base0B = "#f7ddff" # Strings, Inherited Class, Markup Code, Diff Inserted
+base0C = "#c5edc1" # Support, Regular Expressions, Escape Characters, Markup Quotes
+base0D = "#c9fff7" # Functions, Methods, Attribute IDs, Headings
+base0E = "#dcc3f9" # Keywords, Storage, Selector, Markup Italic, Diff Changed
+base0F = "#f6dddd" # Deprecated, Opening/Closing Embedded Language Tags, e.g. <?php ?>