diff --git a/demos/calendar/js/calendar.js b/demos/calendar/js/calendar.js
index 472c8ba1..b3d4f527 100644
--- a/demos/calendar/js/calendar.js
+++ b/demos/calendar/js/calendar.js
@@ -14,41 +14,42 @@ Ox.load('UI', {debug: true, hideScreen: true, showScreen: true, theme: 'modern'}
     Ox.Calendar({
         date: new Date(0),
         dates: [
-            {name: 'Genghis Khan', start: new Date('1162'), stop: new Date('1228'), type: 'Person'},
-            {name: 'Marco Polo', start: new Date('1254'), stop: new Date('1324-01-09'), type: 'Person'},
-            {name: 'Columbus', start: new Date('1451-08-22'), stop: new Date('1506-05-21'), type: 'Person'},
-            {name: 'Da Vinci', start: new Date('1452-04-15'), stop: new Date('1519-05-03'), type: 'Person'},
-            {name: 'Michelangelo', start: new Date('1475-03-06'), stop: new Date('1564-02-19'), type: 'Person'},
-            {name: 'Bruegel', start: new Date('1525'), stop: new Date('1569-09-10'), type: 'Person'},
-            {name: 'Galilei', start: new Date('1564-02-15'), stop: new Date('1642-01-09'), type: 'Person'},
-            {name: 'Shakespeare', start: new Date('1564-04-26'), stop: new Date('1616-04-24'), type: 'Person'},
-            {name: 'Descartes', start: new Date('1596-03-31'), stop: new Date('1650-02-12'), type: 'Person'},
-            {name: 'Velazquez', start: new Date('1599-06-06'), stop: new Date('1660-08-07'), type: 'Person'},
-            {name: 'Vermeer', start: new Date('1632-10-31'), stop: new Date('1675-12-16'), type: 'Person'},
-            {name: 'Spinoza', start: new Date('1632-11-24'), stop: new Date('1677-02-22'), type: 'Person'},
-            {name: 'Louix XIV', start: new Date('1638-09-05'), stop: new Date('1715-09-02'), type: 'Person'},
-            {name: 'Newton', start: new Date('1643-01-04'), stop: new Date('1727-04-01'), type: 'Person'},
-            {name: 'Leibniz', start: new Date('1646-07-01'), stop: new Date('1716-11-15'), type: 'Person'},
-            {name: 'Kant', start: new Date('1724-04-22'), stop: new Date('1804-02-13'), type: 'Person'},
-            {name: 'Napoleon', start: new Date('1769-08-15'), stop: new Date('1821-05-06'), type: 'Person'},
-            {name: 'Hegel', start: new Date('1770-08-27'), stop: new Date('1831-11-15'), type: 'Person'},
-            {name: 'Darwin', start: new Date('1809-02-12'), stop: new Date('1882-04-20'), type: 'Person'},
-            {name: 'Marx', start: new Date('1818-05-05'), stop: new Date('1883-03-15'), type: 'Person'},
+            {name: 'Genghis Khan', start: '1162', stop: '1228', type: 'Person'},
+            {name: 'Marco Polo', start: '1254', stop: '1324-01-08', type: 'Person'},
+            {name: 'Columbus', start: '1451-08-22', stop: '1506-05-20', type: 'Person'},
+            {name: 'Da Vinci', start: '1452-04-15', stop: '1519-05-02', type: 'Person'},
+            {name: 'Michelangelo', start: '1475-03-06', stop: '1564-02-18', type: 'Person'},
+            {name: 'Bruegel', start: '1525', stop: '1569-09-09', type: 'Person'},
+            {name: 'Galilei', start: '1564-02-15', stop: '1642-01-08', type: 'Person'},
+            {name: 'Shakespeare', start: '1564-04-26', stop: '1616-04-23', type: 'Person'},
+            {name: 'Descartes', start: '1596-03-31', stop: '1650-02-11', type: 'Person'},
+            {name: 'Velazquez', start: '1599-06-06', stop: '1660-08-06', type: 'Person'},
+            {name: 'Vermeer', start: '1632-10-31', stop: '1675-12-15', type: 'Person'},
+            {name: 'Spinoza', start: '1632-11-24', stop: '1677-02-21', type: 'Person'},
+            {name: 'Louix XIV', start: '1638-09-05', stop: '1715-09-01', type: 'Person'},
+            {name: 'Newton', start: '1643-01-04', stop: '1727-03-31', type: 'Person'},
+            {name: 'Leibniz', start: '1646-07-01', stop: '1716-11-14', type: 'Person'},
+            {name: 'Kant', start: '1724-04-22', stop: '1804-02-12', type: 'Person'},
+            {name: 'Napoleon', start: '1769-08-15', stop: '1821-05-05', type: 'Person'},
+            {name: 'Hegel', start: '1770-08-27', stop: '1831-11-14', type: 'Person'},
+            {name: 'Darwin', start: '1809-02-12', stop: '1882-04-19', type: 'Person'},
+            {name: 'Marx', start: '1818-05-05', stop: '1883-03-14', type: 'Person'},
+            ///*
+            {name: 'Gandhi', start: '1869-10-02', stop: '1948-01-30', type: 'Person'},
+            {name: 'Lenin', start: '1870-04-22', stop: '1924-01-21', type: 'Person'},
+            {name: 'Stalin', start: '1878-12-18', stop: '1953-03-05', type: 'Person'},
+            {name: 'Einstein', start: '1879-03-14', stop: '1955-04-18', type: 'Person'},
+            {name: 'Picasso', start: '1881-10-25', stop: '1973-04-08', type: 'Person'},
+            {name: 'Roosevelt', start: '1882-01-30', stop: '1945-04-12', type: 'Person'},
+            {name: 'Hitler', start: '1889-04-20', stop: '1945-04-30', type: 'Person'},
+            {name: 'Hitchcock', start: '1899-08-13', stop: '1980-04-29', type: 'Person'},
+            {name: 'Turing', start: '1912-06-23', stop: '1954-06-07', type: 'Person'},
+            {name: 'Kennedy', start: '1917-05-29', stop: '1963-11-22', type: 'Person'},
+            {name: 'Deleuze', start: '1925-01-18', stop: '1995-11-04', type: 'Person'},
+            {name: 'Warhol', start: '1928-08-06', stop: '1987-02-22', type: 'Person'},
+            {name: 'Debord', start: '1931-12-28', stop: '1994-11-30', type: 'Person'},
+            //*/
             /*
-            {name: 'Gandhi', start: new Date('1869-10-02'), stop: new Date('1948-01-31'), type: 'Person'},
-            {name: 'Lenin', start: new Date('1870-04-22'), stop: new Date('1924-01-22'), type: 'Person'},
-            {name: 'Stalin', start: new Date('1878-12-18'), stop: new Date('1953-03-06'), type: 'Person'},
-            {name: 'Einstein', start: new Date('1879-03-14'), stop: new Date('1955-04-19'), type: 'Person'},
-            {name: 'Picasso', start: new Date('1881-10-25'), stop: new Date('1973-04-09'), type: 'Person'},
-            {name: 'Roosevelt', start: new Date('1882-01-30'), stop: new Date('1945-04-13'), type: 'Person'},
-            {name: 'Hitler', start: new Date('1889-04-20'), stop: new Date('1945-05-01'), type: 'Person'},
-            {name: 'Hitchcock', start: new Date('1899-08-13'), stop: new Date('1980-04-30'), type: 'Person'},
-            {name: 'Turing', start: new Date('1912-06-23'), stop: new Date('1954-06-08'), type: 'Person'},
-            {name: 'Kennedy', start: new Date('1917-05-29'), stop: new Date('1963-11-23'), type: 'Person'},
-            {name: 'Deleuze', start: new Date('1925-01-18'), stop: new Date('1995-11-05'), type: 'Person'},
-            {name: 'Warhol', start: new Date('1928-08-06'), stop: new Date('1987-02-23'), type: 'Person'},
-            {name: 'Debord', start: new Date('1931-12-28'), stop: new Date('1994-12-01'), type: 'Person'},
-            */
             {name: 'Test', start: new Date('1970-01-01'), stop: new Date('1970-01-02')},
             {name: 'Battle of Hastings', start: new Date('1066-10-14'), stop: new Date('1066-10-15')},
             {name: 'Renaissance', start: new Date('1300'), stop: new Date('1700')},
@@ -134,6 +135,7 @@ Ox.load('UI', {debug: true, hideScreen: true, showScreen: true, theme: 'modern'}
             {name: 'Carlo Giuliani', start: new Date('2001-07-20'), stop: new Date('2001-07-21')},
             {name: '9-11', start: new Date('2001-09-11'), stop: new Date('2001-09-12')},
             {name: 'Fukushima', start: new Date('2011-03-11'), stop: new Date('2011-03-12')}
+            */
         ],
         height: window.innerHeight,
         width: window.innerWidth
diff --git a/source/Ox.UI/js/Video/Ox.VideoEditor.js b/source/Ox.UI/js/Video/Ox.VideoEditor.js
index 4eb5ad2c..c553415e 100644
--- a/source/Ox.UI/js/Video/Ox.VideoEditor.js
+++ b/source/Ox.UI/js/Video/Ox.VideoEditor.js
@@ -329,7 +329,7 @@ Ox.VideoEditor = function(options, self) {
         {key: 'G', action: 'Go to Next Result'},
         {key: 'S', action: 'Select Current Annotation'},
         {key: 'E', action: 'Edit Selected Annotation'},
-        {key: Ox.UI.symbols.return, action: 'Submit'},
+        {key: Ox.UI.symbols['return'], action: 'Submit'},
         {key: Ox.UI.symbols.escape, action: 'Cancel'},
     ].forEach(function(shortcut) {
         self.$keyboardShortcuts.append(