diff --git a/source/Ox.UI/css/Ox.UI.css b/source/Ox.UI/css/Ox.UI.css
index 6156104a..70d9fd0f 100644
--- a/source/Ox.UI/css/Ox.UI.css
+++ b/source/Ox.UI/css/Ox.UI.css
@@ -906,6 +906,20 @@ input.OxInput {
 div.OxInput > input.OxInput {
     float: left;
 }
+
+/*
+--------------------------------------------------------------------------------
+OxEditableContent
+--------------------------------------------------------------------------------
+*/
+
+.OxEditableContent > .OxEditableContentInput:focus {
+    outline: none;
+    -moz-user-select: text;
+    -o-user-select: text;
+    -webkit-user-select: text;
+}
+
 /*
 --------------------------------------------------------------------------------
 OxEditableElement
diff --git a/source/Ox.UI/css/theme.css b/source/Ox.UI/css/theme.css
index 1b86b231..3db43523 100644
--- a/source/Ox.UI/css/theme.css
+++ b/source/Ox.UI/css/theme.css
@@ -455,6 +455,17 @@ Forms
 .$themeClass .OxArrayEditable.OxArrayEditableTextarea .OxEditableElement {
     border-top-color: $bodyBorder;
 }
+
+.$themeClass .OxEditableContent > .OxEditableContentInput:focus {
+    background-image: -moz-linear-gradient(top, $inputGradient);
+    background-image: -o-linear-gradient(top, $inputGradient);
+    background-image: -webkit-linear-gradient(top, $inputGradient);
+    box-shadow: 0 0 2px $formelementFocusShadow;
+    -moz-box-shadow: 0 0 2px $formelementFocusShadow;
+    -o-box-shadow: 0 0 2px $formelementFocusShadow;
+    -webkit-box-shadow: 0 0 2px $formelementFocusShadow;
+}
+
 .$themeClass .OxEditableElement.OxSelected {
     background-color: $videoAnnotationSelectedBackground;
 }
@@ -1177,9 +1188,19 @@ Miscellaneous
     -webkit-box-shadow: 2px 2px 4px $tooltipShadow;
 }
 
-.$themeClass ::selection,
-.$themeClass ::-moz-selection,
-.$themeClass ::-o-selection,
-.$themeClass ::-webkit-selection {
-    background-color: $bodySelectionBackground;
+.$themeClass ::selection {
+    background: $bodySelectionBackground;
+    // FIXME color: bodySelectionColor;
+}
+.$themeClass ::-moz-selection {
+    background: $bodySelectionBackground;
+    // FIXME color: bodySelectionColor;
+}
+.$themeClass ::-o-selection {
+    background: $bodySelectionBackground;
+    // FIXME color: bodySelectionColor;
+}
+.$themeClass ::-webkit-selection {
+    background: $bodySelectionBackground;
+    // FIXME color: bodySelectionColor;
 }