diff --git a/grammars/mblf.cson b/grammars/mblf.cson
index 39c2053..a47e55a 100644
--- a/grammars/mblf.cson
+++ b/grammars/mblf.cson
@@ -1,14 +1,37 @@
 # If this is your first time writing a language grammar, check out:
 #   - https://flight-manual.atom.io/hacking-atom/sections/creating-a-grammar/
 
-'scopeName': 'source.mblf'
-'name': 'Mblf'
-'fileTypes': [
+scopeName: 'source.mblf'
+name: 'MBLF'
+fileTypes: [
   'extension'
 ]
-'patterns': [
+patterns: [
   {
-    'match': '^\\s*@@.*$'
-    'name': 'comment'
+    match: '(^\\s*)(\#include)\ +(\"([[:ascii:]]+)(\.mblf)?\")'
+    captures:
+      2: name: 'keyword'
+      3: name: 'string'
+  },
+  {
+    match: '(^\\s*)(add(b)?|sub(b)?)\ +(((0x)?(\\d|[A-F])+)|(\"\[[:ascii:]]\"))'
+    captures:
+      6: name: 'constant'
+      9: name: 'string'
+  },
+  {
+    match: '(^\\s*)((del)?var)\ +((?=[[:ascii:]])[^;]+)'
+    captures:
+      2: name: 'keyword.operator'
+      4: name: 'builtin.variable'
+  },
+  {
+    match: '(^\\s*)(point(m)?|addv|subv|copy)\ +((?=[[:ascii:]])[^;]+)'
+    captures:
+      4: name: 'builtin.variable'
+  },
+  {
+    match: ';;.*$'
+    name: 'comment'
   }
 ]
diff --git a/package-lock.json b/package-lock.json
index af4d3b6..b8ea4ab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 {
   "name": "language-mblf",
-  "version": "0.0.0",
+  "version": "0.1.0",
   "lockfileVersion": 1
 }
diff --git a/package.json b/package.json
index f90c90b..1ab8d3d 100644
--- a/package.json
+++ b/package.json
@@ -1,13 +1,13 @@
 {
   "name": "language-mblf",
-  "version": "0.0.0",
+  "version": "0.1.0",
   "description": "The atom language package for mblf, by the makers of mblf",
   "keywords": [
     "mblf",
     "language",
     "grammar"
   ],
-  "repository": "https://github.com/Brainfuck-Project/language-mblf",
+  "repository": "https://github.com/MBLF-Project/language-mblf",
   "license": "MIT",
   "engines": {
     "atom": ">=1.0.0 <2.0.0"
diff --git a/settings/language-mblf.cson b/settings/language-mblf.cson
index 40a1e5c..7b730f7 100644
--- a/settings/language-mblf.cson
+++ b/settings/language-mblf.cson
@@ -2,5 +2,5 @@
 # https://github.com/atom/language-gfm/blob/master/settings/gfm.cson
 
 '.source.mblf':
-  'editor':
-    'commentStart': '@@ '
+  editor:
+    commentStart: ';; '
diff --git a/snippets/language-mblf.cson b/snippets/language-mblf.cson
index f75422c..27d0a62 100644
--- a/snippets/language-mblf.cson
+++ b/snippets/language-mblf.cson
@@ -2,6 +2,9 @@
 # https://github.com/atom/language-javascript/blob/master/snippets/javascript.cson
 
 '.source.mblf':
-  'Method documentation':
-    'prefix': 'doc'
-    'body': '@@ ${1:method} - ${2:description}'
+  Documentation:
+    prefix: 'doc'
+    body: ';; ${1:method} - ${2:description}'
+  Variable:
+    prefix: 'var'
+    body: 'var ${1:name}'