diff --git a/source/Ox.UI/themes/modern/json/theme.jsonc b/source/Ox.UI/themes/oxdark/json/theme.jsonc
similarity index 99%
rename from source/Ox.UI/themes/modern/json/theme.jsonc
rename to source/Ox.UI/themes/oxdark/json/theme.jsonc
index 44664f82..48e8b457 100644
--- a/source/Ox.UI/themes/modern/json/theme.jsonc
+++ b/source/Ox.UI/themes/oxdark/json/theme.jsonc
@@ -1,6 +1,6 @@
 {
 
-    "themeName": "0x Dark",
+    "themeName": "Ox Dark",
     "themeBackgroundLightness": 0.25,
     "themeColorLightness": 0.75,
 
diff --git a/source/Ox.UI/themes/modern/png/icon16.png b/source/Ox.UI/themes/oxdark/png/icon16.png
similarity index 100%
rename from source/Ox.UI/themes/modern/png/icon16.png
rename to source/Ox.UI/themes/oxdark/png/icon16.png
diff --git a/source/Ox.UI/themes/modern/png/logo128.png b/source/Ox.UI/themes/oxdark/png/logo128.png
similarity index 100%
rename from source/Ox.UI/themes/modern/png/logo128.png
rename to source/Ox.UI/themes/oxdark/png/logo128.png
diff --git a/source/Ox.UI/themes/modern/png/scrollbarHorizontalDecrement.png b/source/Ox.UI/themes/oxdark/png/scrollbarHorizontalDecrement.png
similarity index 100%
rename from source/Ox.UI/themes/modern/png/scrollbarHorizontalDecrement.png
rename to source/Ox.UI/themes/oxdark/png/scrollbarHorizontalDecrement.png
diff --git a/source/Ox.UI/themes/modern/png/scrollbarHorizontalIncrement.png b/source/Ox.UI/themes/oxdark/png/scrollbarHorizontalIncrement.png
similarity index 100%
rename from source/Ox.UI/themes/modern/png/scrollbarHorizontalIncrement.png
rename to source/Ox.UI/themes/oxdark/png/scrollbarHorizontalIncrement.png
diff --git a/source/Ox.UI/themes/modern/png/scrollbarVerticalDecrement.png b/source/Ox.UI/themes/oxdark/png/scrollbarVerticalDecrement.png
similarity index 100%
rename from source/Ox.UI/themes/modern/png/scrollbarVerticalDecrement.png
rename to source/Ox.UI/themes/oxdark/png/scrollbarVerticalDecrement.png
diff --git a/source/Ox.UI/themes/modern/png/scrollbarVerticalIncrement.png b/source/Ox.UI/themes/oxdark/png/scrollbarVerticalIncrement.png
similarity index 100%
rename from source/Ox.UI/themes/modern/png/scrollbarVerticalIncrement.png
rename to source/Ox.UI/themes/oxdark/png/scrollbarVerticalIncrement.png
diff --git a/source/Ox.UI/themes/classic/json/theme.jsonc b/source/Ox.UI/themes/oxlight/json/theme.jsonc
similarity index 99%
rename from source/Ox.UI/themes/classic/json/theme.jsonc
rename to source/Ox.UI/themes/oxlight/json/theme.jsonc
index 784793d0..6e566f04 100644
--- a/source/Ox.UI/themes/classic/json/theme.jsonc
+++ b/source/Ox.UI/themes/oxlight/json/theme.jsonc
@@ -1,6 +1,6 @@
 {
 
-    "themeName": "0x Light",
+    "themeName": "Ox Light",
     "themeBackgroundLightness": 0.75,
     "themeColorLightness": 0.25,
 
diff --git a/source/Ox.UI/themes/classic/png/icon16.png b/source/Ox.UI/themes/oxlight/png/icon16.png
similarity index 100%
rename from source/Ox.UI/themes/classic/png/icon16.png
rename to source/Ox.UI/themes/oxlight/png/icon16.png
diff --git a/source/Ox.UI/themes/classic/png/logo128.png b/source/Ox.UI/themes/oxlight/png/logo128.png
similarity index 100%
rename from source/Ox.UI/themes/classic/png/logo128.png
rename to source/Ox.UI/themes/oxlight/png/logo128.png
diff --git a/source/Ox.UI/themes/classic/png/scrollbarHorizontalDecrement.png b/source/Ox.UI/themes/oxlight/png/scrollbarHorizontalDecrement.png
similarity index 100%
rename from source/Ox.UI/themes/classic/png/scrollbarHorizontalDecrement.png
rename to source/Ox.UI/themes/oxlight/png/scrollbarHorizontalDecrement.png
diff --git a/source/Ox.UI/themes/classic/png/scrollbarHorizontalIncrement.png b/source/Ox.UI/themes/oxlight/png/scrollbarHorizontalIncrement.png
similarity index 100%
rename from source/Ox.UI/themes/classic/png/scrollbarHorizontalIncrement.png
rename to source/Ox.UI/themes/oxlight/png/scrollbarHorizontalIncrement.png
diff --git a/source/Ox.UI/themes/classic/png/scrollbarVerticalDecrement.png b/source/Ox.UI/themes/oxlight/png/scrollbarVerticalDecrement.png
similarity index 100%
rename from source/Ox.UI/themes/classic/png/scrollbarVerticalDecrement.png
rename to source/Ox.UI/themes/oxlight/png/scrollbarVerticalDecrement.png
diff --git a/source/Ox.UI/themes/classic/png/scrollbarVerticalIncrement.png b/source/Ox.UI/themes/oxlight/png/scrollbarVerticalIncrement.png
similarity index 100%
rename from source/Ox.UI/themes/classic/png/scrollbarVerticalIncrement.png
rename to source/Ox.UI/themes/oxlight/png/scrollbarVerticalIncrement.png
diff --git a/source/Ox.UI/themes/oxmedium/json/theme.jsonc b/source/Ox.UI/themes/oxmedium/json/theme.jsonc
new file mode 100644
index 00000000..0c818e9a
--- /dev/null
+++ b/source/Ox.UI/themes/oxmedium/json/theme.jsonc
@@ -0,0 +1,240 @@
+{
+
+    "themeName": "Ox Medium",
+    "themeBackgroundLightness": 0.75,
+    "themeColorLightness": 0.25,
+
+    "barGradient": [[160, 160, 160], [128, 128, 128]],
+    "barSelectedColor": [255, 255, 255],
+    "barSelectedGradient": [[80, 80, 80], [48, 48, 48]],
+
+    "bodyBackground": [144, 144, 144],
+    "bodyBorder": [128, 128, 128],
+    "bodyColor": [0, 0, 0],
+    "bodyBrightColor": [0, 0, 0],
+    "bodyHighlightColor": [255, 0, 0],
+    "bodyHighlightGradient": [[0, 0, 0, 0], [0, 0, 0, 0]],
+    "bodyLightColor": [64, 64, 64],
+    "bodyFocusSelectedLightColor": [192, 192, 192],
+    "bodySelectedLightColor": [128, 128, 128],
+    "bodyLinkColor": [0, 0, 128],
+    "bodyReflectionGradient": [[144, 144, 144, 0.75], [144, 144, 144, 1]],
+    "bodySelectionBackground": [192, 192, 192],
+    "bodyWarningBorder": [255, 64, 64],
+
+    "buttonGradient": [[176, 176, 176], [144, 144, 144]],
+    "buttonActiveColor": [0, 0, 0],
+    "buttonActiveGradient": [[160, 160, 160], [160, 160, 160]],
+    "buttonDisabledColor": [64, 64, 64],
+    "buttonDisabledGradient": [[128, 128, 128], [96, 96, 96]],
+    "buttonSelectedColor": [255, 255, 255],
+    "buttonSelectedGradient": [[96, 96, 96], [128, 128, 128]],
+
+    "calendarBackground": [144, 144, 144],
+    "calendarControlBorder": [64, 64, 64],
+    "calendarControlColor": [0, 0, 0],
+    "calendarControlGradient": [[160, 160, 160, 0.75], [160, 160, 160, 0.75]],
+    "calendarEventColor": [0, 0, 0],
+    "calendarEventShadow": [0, 0, 0],
+    "calendarEventDateGradient": [[128, 128, 255, 0.9], [96, 96, 224, 0.9]],
+    "calendarEventOtherGradient": [[255, 128, 128, 0.9], [224, 96, 96, 0.9]],
+    "calendarEventPersonGradient": [[255, 128, 0, 0.9], [224, 96, 0, 0.9]],
+    "calendarEventPlaceGradient": [[0, 192, 96, 0.9], [0, 160, 64, 0.9]],
+    "calendarLineBackground": [224, 224, 224],
+    "calendarOverlayOddBackground": [255, 255, 255, 0.25],
+    "calendarOverlayEvenBackground": [0, 0, 0, 0.25],
+    "calendarOverlayEvenShadow": [0, 0, 0],
+    "calendarTimelineOddGradient": [[224, 224, 224], [192, 192, 192]],
+    "calendarTimelineEvenGradient": [[208, 208, 208], [176, 176, 176]],
+
+    "colorBlue": [],
+    "colorCyan": [],
+    "colorGreen": [],
+    "colorMagenta": [],
+    "colorOrange": [],
+    "colorRed": [],
+    "colorYellow": [],
+
+    "dialogBackground": [160, 160, 160, 0.95],
+    "dialogShadow": [0, 0, 0, 0.75],
+    "dialogBarGradient": [[160, 160, 160, 0.95], [128, 128, 128, 0.95]],
+    "dialogLayerBackground": [0, 0, 0],
+    "dialogReflectionGradient": [[160, 160, 160, 0.75], [160, 160, 160, 1]],
+
+    "documentBorder": [128, 128, 128],
+    "documentCodeColor": [0, 0, 64],
+    "documentLabelBackground": [144, 144, 144],
+    "documentWarningColor": [192, 0, 0],
+
+    "formelementBorder": [128, 128, 128],
+    "formelementColor": [0, 0, 0],
+    "formelementFocusShadow": [192, 192, 192],
+
+    "gridGradient": [[248, 248, 248], [232, 232, 232]],
+
+    "inputGradient": [[144, 144, 144], [176, 176, 176]],
+    "inputActiveGradient": [[160, 160, 160], [192, 192, 192]],
+    "inputDisabledGradient": [[128, 128, 128], [128, 128, 128]],
+    "inputErrorColor": [192, 64, 64],
+    "inputFocusBorder": [192, 192, 192],
+    "inputFocusShadow": [192, 192, 192],
+    "inputPlaceholderColor": [64, 64, 64],
+
+    "labelBackground": [160, 160, 160],
+    "labelDisabledColor": [128, 128, 128],
+
+    "listHeadBorder": [128, 128, 128],
+    "listHeadSelectedColor": [255, 255, 255],
+    "listHeadSelectedGradient": [[128, 128, 128], [96, 96, 96]],
+
+    "listIconLoadingBorder": [112, 112, 112],
+    "listIconLoadingGradient": [[160, 160, 160], [128, 128, 128]],
+    "listIconFocusSelectedBorder": [112, 112, 112],
+    "listIconFocusSelectedShadow": [112, 112, 112],
+    "listIconSelectedBorder": [128, 128, 128],
+    "listIconSelectedShadow": [128, 128, 128],
+    "listIconLabelFocusSelectedBorder": [112, 112, 112],
+    "listIconLabelFocusSelectedGradient": [[128, 128, 128], [96, 96, 96]],
+    "listIconLabelFocusSelectedShadow": [112, 112, 112],
+    "listIconLabelSelectedBorder": [128, 128, 128],
+    "listIconLabelSelectedGradient": [[144, 144, 144], [112, 112, 112]],
+    "listIconLabelSelectedShadow": [128, 128, 128],
+    "listIconTextShadow": [192, 192, 192],
+    "listIconTextFocusSelectedShadow": [64, 64, 64],
+    "listIconTextSelectedShadow": [64, 64, 64],
+
+    "listItemBorder": [128, 128, 128],
+    "listItemGradient": [[144, 144, 144], [144, 144, 144]],
+    "listItemOddGradient": [[146, 146, 146], [146, 146, 146]],
+    "listItemEvenGradient": [[142, 142, 142], [142, 142, 142]],
+    "listItemDropOddGradient": [[194, 194, 194], [194, 194, 194]],
+    "listItemDropEvenGradient": [[190, 190, 190], [190, 190, 190]],
+    "listItemFocusSelectedBorder": [96, 96, 96],
+    "listItemFocusSelectedColor": [255, 255, 255],    
+    "listItemFocusSelectedGradient": [[112, 112, 112], [112, 112, 112]],
+    "listItemFocusSelectedOddGradient": [[114, 114, 114], [114, 114, 114]],
+    "listItemFocusSelectedEvenGradient": [[110, 110, 110], [110, 110, 110]],
+    "listItemSelectedBorder": [112, 112, 112],
+    "listItemSelectedColor": [255, 255, 255],
+    "listItemSelectedGradient": [[128, 128, 128], [128, 128, 128]],
+    "listItemSelectedOddGradient": [[130, 130, 130], [130, 130, 130]],
+    "listItemSelectedEvenGradient": [[126, 126, 126], [126, 126, 126]],
+
+    "mapControlBorder": [0, 0, 0],
+    "mapControlColor": [0, 0, 0],
+    "mapControlGradient": [[160, 160, 160, 0.75], [160, 160, 160, 0.75]],
+    "mapPlaceBorder": [0, 0, 0],
+    "mapPlaceEditingBorder": [64, 128, 192],
+    "mapPlaceSelectedBorder": [255, 255, 255],
+    "mapPlaceBoroughColor": [255, 128, 0],
+    "mapPlaceBuildingColor": [255, 64, 128],
+    "mapPlaceCityColor": [255, 0, 0],
+    "mapPlaceCountryColor": [64, 64, 255],
+    "mapPlaceFeatureColor": [0, 192, 0],
+    "mapPlaceRegionColor": [0, 192, 192],
+    "mapPlaceStreetColor": [255, 255, 0],
+
+    "mediaBackground": [128, 128, 128],
+    "mediaColor": [0, 0, 0],
+    "mediaReflectionGradient": [[128, 128, 128, 0.75], [128, 128, 128, 1]],
+    "mediaListIconLoadingBorder": [160, 160, 160],
+    "mediaListIconLoadingGradient": [[144, 144, 144], [112, 112, 112]],
+    "mediaListIconFocusSelectedBorder": [64, 128, 192],
+    "mediaListIconFocusSelectedShadow": [64, 128, 192],
+    "mediaListIconSelectedBorder": [160, 160, 160],
+    "mediaListIconSelectedShadow": [160, 160, 160],
+    "mediaListIconLabelFocusSelectedBorder": [64, 128, 192],
+    "mediaListIconLabelFocusSelectedGradient": [[80, 144, 208], [48, 112, 178]],
+    "mediaListIconLabelFocusSelectedShadow": [64, 128, 192],
+    "mediaListIconLabelSelectedBorder": [160, 160, 160],
+    "mediaListIconLabelSelectedGradient": [[192, 192, 192], [160, 160, 160]],
+    "mediaListIconLabelSelectedShadow": [160, 160, 160],
+    "mediaListIconTextColor": [255, 255, 255],
+    "mediaListIconTextFocusSelectedColor": [255, 255, 255],
+    "mediaListIconTextSelectedColor": [255, 255, 255],
+    "mediaListIconTextLightColor": [192, 192, 192],
+    "mediaListIconTextFocusSelectedLightColor": [192, 192, 192],
+    "mediaListIconTextSelectedLightColor": [192, 192, 192],
+    "mediaListIconTextShadow": [128, 128, 128],
+    "mediaListIconTextFocusSelectedShadow": [0, 0, 0, 0],
+    "mediaListIconTextSelectedShadow": [128, 128, 128],
+
+    "menuBackground": [144, 144, 144, 0.96],
+    "menuBorder": [128, 128, 128, 0.96],
+    "menuShadow": [0, 0, 0, 0.75],
+    "menuDisabledColor": [64, 64, 64],
+    "menuSelectedColor": [255, 255, 255],
+    "menuSelectedGradient": [[112, 112, 112, 0.96], [112, 112, 112, 0.96]],
+
+    "progressbarBackground": [0, 0, 0, 0.05],
+    "progressbarAnimateBackground": [0, 0, 0, 0.1],
+
+    "screenBackground": [128, 128, 128],
+    "screenColor": [0, 0, 0],
+    "screenReflectionGradient": [[128, 128, 128, 0.75], [128, 128, 128, 1], [128, 128, 128, 1]],
+
+    "scrollbarCornerGradient": [[176, 176, 176], [112, 112, 112]],
+
+    "sourcecodeBackground": [160, 160, 160],
+    "sourcecodeCommentColor": [96, 96, 96],
+    "sourcecodeConstantColor": [128, 0, 0],
+    "sourcecodeErrorBackground": [255, 255, 255],
+    "sourcecodeErrorColor": [255, 255, 0],
+    "sourcecodeIdentifierColor": [0, 0, 0],
+    "sourcecodeKeywordColor": [0, 0, 128],
+    "sourcecodeLinenumbersBackground": [176, 176, 176],
+    "sourcecodeLinenumbersColor": [128, 128, 128],
+    "sourcecodeMethodColor": [0, 128, 128],
+    "sourcecodeNumberColor": [128, 0, 0],
+    "sourcecodeObjectColor": [0, 128, 128],
+    "sourcecodeOperatorColor": [0, 0, 128],
+    "sourcecodePropertyColor": [0, 128, 0],
+    "sourcecodeRegexpColor": [128, 128, 0],
+    "sourcecodeStringColor": [0, 128, 0],
+    "sourcecodeSpecialColor": [192, 192, 192],
+    "sourcecodeWhitespaceBackground": [255, 255, 0],
+
+    "sourceviewerCodeBackground": [160, 160, 160],
+    "sourceviewerCodeShadow": [144, 144, 144],
+
+    "symbolDefaultColor": [0, 0, 0],
+    "symbolDisabledColor": [64, 64, 64],
+    "symbolFailedColor": [192, 64, 64],
+    "symbolPassedColor": [64, 192, 64],
+    "symbolSelectedColor": [255, 255, 255],
+    "symbolVideoColor": [255, 255, 255],
+    "symbolWarningColor": [255, 0, 0],
+
+    "tooltipBorder": [128, 128, 128, 0.96],
+    "tooltipColor": [0, 0, 0],
+    "tooltipGradient": [[160, 160, 160, 0.96], [160, 160, 160, 0.96]],
+    "tooltipShadow": [0, 0, 0, 0.5],
+
+    "videoBarGradient": [[160, 160, 160, 0.5], [128, 128, 128, 0.5]],
+    "videoButtonGradient": [[160, 160, 160, 0.75], [128, 128, 128, 0.75]],
+    "videoButtonActiveGradient": [[160, 160, 160], [128, 128, 128]],
+    "videoInputGradient": [[128, 128, 128, 0.75], [160, 160, 160, 0.75]],
+    "videoMenuBackground": [144, 144, 144, 0.5],
+    "videoMenuBorder": [128, 128, 128, 0.5],
+    "videoMenuSelectedGradient": [[112, 112, 112, 0.5], [112, 112, 112, 0.5]],
+
+    "videoAnnotationEditableEditingBackground": [64, 192, 64],
+    "videoAnnotationEditableEditingColor": [0, 0, 0],
+    "videoAnnotationEditableSelectedBackground": [64, 128, 192],
+    "videoAnnotationEditableSelectedShadow": [64, 64, 64],
+    "videoAnnotationSelectedBackground": [80, 80, 80],
+    "videoAnnotationSeparatorColor": [112, 112, 112],
+
+    "videoMarkerBackground": [255, 255, 255],
+    "videoMarkerBorder": [0, 0, 0],
+
+    "videoTimelineDefaultGradient": [[64, 64, 64], [192, 192, 192]],
+    "videoTimelineEditableGradient": [[0, 0, 128], [128, 128, 255]],
+    "videoTimelineEditingGradient": [[0, 128, 0], [128, 255, 128]],
+    "videoTimelineResultGradient": [[0, 0, 0], [255, 255, 0]],
+    "videoTimelineSelectedGradient": [[0, 0, 0], [255, 255, 255]],
+    "videoTimelineMarkerShadow": [0, 0, 0, 0.5],
+    "videoTimelineMarkerPausedBorder": [255, 255, 255, 0.5],
+    "videoTimelineMarkerPlayingBorder": [255, 255, 255]
+
+}
\ No newline at end of file
diff --git a/source/Ox.UI/themes/oxmedium/png/icon16.png b/source/Ox.UI/themes/oxmedium/png/icon16.png
new file mode 100644
index 00000000..f0a5880a
Binary files /dev/null and b/source/Ox.UI/themes/oxmedium/png/icon16.png differ
diff --git a/source/Ox.UI/themes/oxmedium/png/logo128.png b/source/Ox.UI/themes/oxmedium/png/logo128.png
new file mode 100644
index 00000000..043364f4
Binary files /dev/null and b/source/Ox.UI/themes/oxmedium/png/logo128.png differ
diff --git a/source/Ox.UI/themes/oxmedium/png/scrollbarHorizontalDecrement.png b/source/Ox.UI/themes/oxmedium/png/scrollbarHorizontalDecrement.png
new file mode 100644
index 00000000..5a19e9b8
Binary files /dev/null and b/source/Ox.UI/themes/oxmedium/png/scrollbarHorizontalDecrement.png differ
diff --git a/source/Ox.UI/themes/oxmedium/png/scrollbarHorizontalIncrement.png b/source/Ox.UI/themes/oxmedium/png/scrollbarHorizontalIncrement.png
new file mode 100644
index 00000000..090f87e4
Binary files /dev/null and b/source/Ox.UI/themes/oxmedium/png/scrollbarHorizontalIncrement.png differ
diff --git a/source/Ox.UI/themes/oxmedium/png/scrollbarVerticalDecrement.png b/source/Ox.UI/themes/oxmedium/png/scrollbarVerticalDecrement.png
new file mode 100644
index 00000000..b12e899d
Binary files /dev/null and b/source/Ox.UI/themes/oxmedium/png/scrollbarVerticalDecrement.png differ
diff --git a/source/Ox.UI/themes/oxmedium/png/scrollbarVerticalIncrement.png b/source/Ox.UI/themes/oxmedium/png/scrollbarVerticalIncrement.png
new file mode 100644
index 00000000..75174087
Binary files /dev/null and b/source/Ox.UI/themes/oxmedium/png/scrollbarVerticalIncrement.png differ