Index: dijit/themes/nihilo/TimePicker.css
===================================================================
--- dijit/themes/nihilo/TimePicker.css	(revision 0)
+++ dijit/themes/nihilo/TimePicker.css	(revision 0)
@@ -0,0 +1,48 @@
+/* Time Picker */
+.nihilo .dijitTimePickerTick,
+.nihilo .dijitTimePickerMarker {
+	border-color: #eeeeee;
+}
+
+.nihilo .dijitTimePickerTick {
+	color:white;
+}
+
+.nihilo .dijitTimePickerMarker {
+	background:#d3d3d3 url("images/titleBar.png") repeat-x top;
+	color:#293a4b;
+	font-weight: bold;
+}
+
+.nihilo .dijitTimePickerItemSelected {
+	color: black;
+	background: #ffe284 none;
+}
+
+.nihilo .dijitTimePickerItemHover {
+	background: #d6d6dd none;
+	color:black;
+}
+
+.nihilo .dijitTimePickerItemHover {
+	position: relative;
+	z-index: 10;
+}
+
+.nihilo .dijitTimePickerTick .dijitTimePickerItemInner {
+	font-size:0.25em;
+}
+
+.nihilo .dijitTimePickerItemHover .dijitTimePickerItemInner {
+	font-size:1em;
+}
+
+.nihilo .dijitTimePickerMarkerHover {
+	border-top: 1px solid #eeeeee;
+}
+
+.nihilo .dijitTimePickerTickHover {
+	margin-top:-0.375em;
+	margin-bottom:-0.375em;
+	border-bottom: none;
+}
Index: dijit/themes/nihilo/nihilo.css
===================================================================
--- dijit/themes/nihilo/nihilo.css	(revision 13259)
+++ dijit/themes/nihilo/nihilo.css	(working copy)
@@ -32,6 +32,7 @@
 @import url("ProgressBar.css");
 @import url("TitlePane.css");
 @import url("Calendar.css");
+@import url("TimePicker.css");
 @import url("Toolbar.css");
 @import url("Dialog.css");
 @import url("Menu.css");
Index: dijit/themes/dijit.css
===================================================================
--- dijit/themes/dijit.css	(revision 13259)
+++ dijit/themes/dijit.css	(working copy)
@@ -1398,47 +1398,37 @@
 	border:0;
 	padding:2px 8px 2px 8px;
 }
-.dijitTimePickerTick {
-	/* opacity:0.1 !important; */
-	color:#dedede;	
-	border-bottom:1px solid #dedede;
-	border-top:1px solid #dedede;
-	position:relative;
-}
-.dijitTimePickerTick .dijitTimePickerItemInner {
-	font-size:0.25em;
-}
+
+.dijitTimePickerTick,
 .dijitTimePickerMarker {
-	background-color:#ededed;
-	border-top:1px solid #999;
-	border-bottom:1px solid #999;
+	border-bottom:1px solid gray;
 }
 
-.dijitTimePickerItemHover {
-	opacity:1 !important;
-	background-color:#808080;
-	color:#fff;
-	border-top:1px solid #333;
-	border-bottom:1px solid #333;
-	cursor:pointer;
+.dijitTimePicker .dijitDownArrowButton {
+	border-top: none !important;
 }
-.dijitTimePickerMarker.dijitTimePickerItemHover {
-	font-size:1.3em;
+
+.dijitTimePickerTick {
+	color:#CCC;
 }
 
-.dijitTimePickerItemHover .dijitTimePickerItemInner {
-	display:block;
-	overflow:visible;
-	background-color:#808080;
-	font-size:1em;
+.dijitTimePickerMarker {
+	color:black;
+	background-color:#CCC;
 }
 
 .dijitTimePickerItemSelected {
 	font-weight:bold;
 	color:#333;
-	background-color:#b7cdee !important;
+	background-color:#b7cdee;
 }
 
+.dijitTimePickerItemHover {
+	background-color:gray;
+	color:white;
+	cursor:pointer;
+}
+
 .dijit_a11y .dijitTimePickerItem {
 	border-bottom:1px solid #333;	
 }
Index: dijit/themes/soria/TimePicker.css
===================================================================
--- dijit/themes/soria/TimePicker.css	(revision 0)
+++ dijit/themes/soria/TimePicker.css	(revision 0)
@@ -0,0 +1,48 @@
+/* Time Picker */
+.soria .dijitTimePickerTick,
+.soria .dijitTimePickerMarker {
+	border-color: #b1badf;
+}
+
+.soria .dijitTimePickerTick {
+	color:white;
+}
+
+.soria .dijitTimePickerMarker {
+	background:#bed7f0 url("images/titleBar.png") repeat-x top;
+	color:#293a4b;
+	font-weight: bold;
+}
+
+.soria .dijitTimePickerItemSelected {
+	color: black;
+	background: #b9cbf1 none;
+}
+
+.soria .dijitTimePickerItemHover {
+	background: #60a1ea none;
+	color:white;
+}
+
+.soria .dijitTimePickerItemHover {
+	position: relative;
+	z-index: 10;
+}
+
+.soria .dijitTimePickerTick .dijitTimePickerItemInner {
+	font-size:0.25em;
+}
+
+.soria .dijitTimePickerItemHover .dijitTimePickerItemInner {
+	font-size:1em;
+}
+
+.soria .dijitTimePickerMarkerHover {
+	border-top: 1px solid #94b9ef;
+}
+
+.soria .dijitTimePickerTickHover {
+	margin-top:-0.375em;
+	margin-bottom:-0.375em;
+	border-bottom: none;
+}
Index: dijit/themes/soria/soria.css
===================================================================
--- dijit/themes/soria/soria.css	(revision 13259)
+++ dijit/themes/soria/soria.css	(working copy)
@@ -32,6 +32,7 @@
 @import url("ProgressBar.css");
 @import url("TitlePane.css");
 @import url("Calendar.css");
+@import url("TimePicker.css");
 @import url("Toolbar.css");
 @import url("Dialog.css");
 @import url("Menu.css");
Index: dijit/themes/tundra/TimePicker.css
===================================================================
--- dijit/themes/tundra/TimePicker.css	(revision 0)
+++ dijit/themes/tundra/TimePicker.css	(revision 0)
@@ -0,0 +1,48 @@
+/* Time Picker */
+.tundra .dijitTimePickerTick,
+.tundra .dijitTimePickerMarker {
+	border-color: #ccc;
+}
+
+.tundra .dijitTimePickerTick {
+	color:white;
+}
+
+.tundra .dijitTimePickerMarker {
+	background:#d3d3d3 url("images/titleBar.png") repeat-x top;
+	color:#293a4b;
+	font-weight: bold;
+}
+
+.tundra .dijitTimePickerItemSelected {
+	color: black;
+	background: #bbc4d0 none;
+}
+
+.tundra .dijitTimePickerItemHover {
+	background: #60a1ea none;
+	color:white;
+}
+
+.tundra .dijitTimePickerItemHover {
+	position: relative;
+	z-index: 10;
+}
+
+.tundra .dijitTimePickerTick .dijitTimePickerItemInner {
+	font-size:0.25em;
+}
+
+.tundra .dijitTimePickerItemHover .dijitTimePickerItemInner {
+	font-size:1em;
+}
+
+.tundra .dijitTimePickerMarkerHover {
+	border-top: 1px solid #ccc;
+}
+
+.tundra .dijitTimePickerTickHover {
+	margin-top:-0.375em;
+	margin-bottom:-0.375em;
+	border-bottom: none;
+}
Index: dijit/themes/tundra/tundra.css
===================================================================
--- dijit/themes/tundra/tundra.css	(revision 13259)
+++ dijit/themes/tundra/tundra.css	(working copy)
@@ -30,6 +30,7 @@
 @import url("ProgressBar.css");
 @import url("TitlePane.css");
 @import url("Calendar.css");
+@import url("TimePicker.css");
 @import url("Toolbar.css");
 @import url("Dialog.css");
 @import url("Menu.css");
Index: dijit/form/templates/TimePicker.html
===================================================================
--- dijit/form/templates/TimePicker.html	(revision 13259)
+++ dijit/form/templates/TimePicker.html	(working copy)
@@ -1,5 +1,9 @@
-<div id="widget_${id}" class="dijitMenu"
-    ><div dojoAttachPoint="upArrow" class="dijitButtonNode"><span class="dijitTimePickerA11yText">&#9650;</span></div
+<div id="widget_${id}" class="dijitMenu ${baseClass}"
+    ><div dojoAttachPoint="upArrow" class="dijitButtonNode dijitUpArrowButton"
+		><div class="dijitReset dijitInline dijitArrowButtonInner" wairole="presentation" role="presentation">&nbsp;</div
+		><div class="dijitArrowButtonChar">&#9650;</div></div
     ><div dojoAttachPoint="timeMenu,focusNode" dojoAttachEvent="onclick:_onOptionSelected,onmouseover,onmouseout"></div
-    ><div dojoAttachPoint="downArrow" class="dijitButtonNode"><span class="dijitTimePickerA11yText">&#9660;</span></div
+    ><div dojoAttachPoint="downArrow" class="dijitButtonNode dijitDownArrowButton"
+		><div class="dijitReset dijitInline dijitArrowButtonInner" wairole="presentation" role="presentation">&nbsp;</div
+		><div class="dijitArrowButtonChar">&#9660;</div></div
 ></div>
Index: dijit/_TimePicker.js
===================================================================
--- dijit/_TimePicker.js	(revision 13259)
+++ dijit/_TimePicker.js	(working copy)
@@ -207,14 +207,23 @@
 
 		onmouseover:function(/*Event*/ e){
 			var tgr = (e.target.parentNode === this.timeMenu) ? e.target : e.target.parentNode;			
+			// if we aren't targeting an item, then we return
+			if(!dojo.hasClass(tgr, this.baseClass+"Item")){return;}
 			this._highlighted_option=tgr;
 			dojo.addClass(tgr, this.baseClass+"ItemHover");
+			if(dojo.hasClass(tgr, this.baseClass+"Marker")){
+				dojo.addClass(tgr, this.baseClass+"MarkerHover");
+			}else{
+				dojo.addClass(tgr, this.baseClass+"TickHover");
+			}
 		},
 
 		onmouseout:function(/*Event*/ e){
 			var tgr = (e.target.parentNode === this.timeMenu) ? e.target : e.target.parentNode;
 			if(this._highlighted_option===tgr){			
 				dojo.removeClass(tgr, this.baseClass+"ItemHover");
+				dojo.removeClass(tgr, this.baseClass+"MarkerHover");
+				dojo.removeClass(tgr, this.baseClass+"TickHover");
 			}
 		},
 
