diff --git a/build/Ox.UI/themes/classic/css/classic.css b/build/Ox.UI/themes/classic/css/classic.css
index 42761923..8fdc9a49 100644
--- a/build/Ox.UI/themes/classic/css/classic.css
+++ b/build/Ox.UI/themes/classic/css/classic.css
@@ -111,13 +111,19 @@ Calendar
 .OxThemeClassic .OxCalendar .OxLine > .OxEvent {
     color: rgb(0, 0, 0);
 }
+.OxThemeClassic .OxCalendar .OxLine > .OxEvent.OxSelected {
+    box-shadow: inset 0 0 1px rgb(0, 0, 0),
+        inset 0 0 1px rgb(0, 0, 0),
+        inset 0 0 1px rgb(0, 0, 0),
+        inset 0 0 1px rgb(0, 0, 0);
+}
 
 .OxThemeClassic .OxCalendar .OxOverlay div:nth-child(even) {
-    border-top: 1px solid rgba(0, 0, 0, 0.5);
-    border-bottom: 1px solid rgba(0, 0, 0, 0.5);
+    background-color: rgba(0, 0, 0, 0.25);
+    box-shadow: inset 0 0 2px rgb(0, 0, 0);
 }
 .OxThemeClassic .OxCalendar .OxOverlay div:nth-child(odd) {
-    background-color: rgba(255, 255, 255, 0.5);
+    background-color: rgba(255, 255, 255, 0.25);
 }
 
 /*
diff --git a/build/Ox.UI/themes/modern/css/modern.css b/build/Ox.UI/themes/modern/css/modern.css
index 3e4f3750..6bcd4784 100644
--- a/build/Ox.UI/themes/modern/css/modern.css
+++ b/build/Ox.UI/themes/modern/css/modern.css
@@ -110,13 +110,19 @@ Calendar
 .OxThemeModern .OxCalendar .OxLine > .OxEvent {
     color: rgb(255, 255, 255);
 }
+.OxThemeModern .OxCalendar .OxLine > .OxEvent.OxSelected {
+    box-shadow: inset 0 0 1px rgb(255, 255, 255),
+        inset 0 0 1px rgb(255, 255, 255),
+        inset 0 0 1px rgb(255, 255, 255),
+        inset 0 0 1px rgb(255, 255, 255);
+}
 
 .OxThemeModern .OxCalendar .OxOverlay div:nth-child(even) {
-    border-top: 1px solid rgba(255, 255, 255, 0.5);
-    border-bottom: 1px solid rgba(255, 255, 255, 0.5);
+    background-color: rgba(255, 255, 255, 0.25);
+    box-shadow: inset 0 0 2px rgb(255, 255, 255);
 }
 .OxThemeModern .OxCalendar .OxOverlay div:nth-child(odd) {
-    background-color: rgba(0, 0, 0, 0.5);
+    background-color: rgba(0, 0, 0, 0.25);
 }
 
 
diff --git a/source/Ox.UI/js/Calendar/Ox.ListCalendar.js b/source/Ox.UI/js/Calendar/Ox.ListCalendar.js
index 4a0f1342..7b7b60c4 100644
--- a/source/Ox.UI/js/Calendar/Ox.ListCalendar.js
+++ b/source/Ox.UI/js/Calendar/Ox.ListCalendar.js
@@ -482,6 +482,7 @@ Ox.ListCalendar = function(options, self) {
                 Ox.print('TIME TO SET LIST OPTIONS:', +new Date() - time0);
                 self.$calendar.addEvent(event);
                 selectEvent(event);
+                self.$nameInput.focusInput();
             } else {
                 alert(result.status.code)
             }