diff --git a/Calendar.sublime-syntax b/Calendar.sublime-syntax
new file mode 100644
index 0000000..c8f9888
--- /dev/null
+++ b/Calendar.sublime-syntax
@@ -0,0 +1,13 @@
+%YAML 1.2
+---
+# http://www.sublimetext.com/docs/3/syntax.html
+name: Calendar
+file_extensions:
+  - calendar
+scope: source.calendar
+contexts:
+  main:
+    - match: '[ ]{3}[\d ]{3}[ ]{3}'
+      scope: selected_day.calendar
+    - match: '   [\d ]{3}   '
+      scope: holiday.calendar
diff --git a/quickcal.py b/quickcal.py
index 047a626..4b4d873 100644
--- a/quickcal.py
+++ b/quickcal.py
@@ -17,6 +17,8 @@
 import json
 import urllib.request
 
+USE_ST_SYNTAX = int(sublime.version()) >= 3084
+ST_SYNTAX = "sublime-syntax" if USE_ST_SYNTAX else 'tmLanguage'
 MONTHS = enum("January February March April May June July August September October November December", start=1, name="Months")
 WEEKDAYS = enum("Monday Tuesday Wednesday Thursday Friday Saturday Sunday", start=1, name="Days")
 
@@ -312,7 +314,7 @@ def run(self, edit, day):
             sunday_first=sublime.load_settings("quickcal.sublime-settings").get("sunday_first", True),
             force_update=True
         )
-        view.set_syntax_file("Packages/QuickCal/Calendar.tmLanguage")
+        view.set_syntax_file("Packages/QuickCal/Calendar.%s" % ST_SYNTAX)
         view.replace(edit, sublime.Region(0, view.size()), bfr)
         view.sel().clear()
         view.settings().set("calendar_current", {"month": str(today.month), "year": today.year})