diff --git a/mythplugins/mythmusic/theme/default/stream-ui.xml b/mythplugins/mythmusic/theme/default/stream-ui.xml
new file mode 100644
index 0000000..f1be394
--- /dev/null
+++ b/mythplugins/mythmusic/theme/default/stream-ui.xml
@@ -0,0 +1,478 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE mythuitheme SYSTEM "http://www.mythtv.org/schema/mythuitheme.dtd">
+
+<mythuitheme>
+
+    <window name="streamview"  include="music-base.xml">
+
+        <shape name="streamlist_background" from="basebackground">
+            <area>15,15,760,211</area>
+        </shape>
+
+        <shape name="playlist_background" from="basebackground">
+            <area>15,231,760,171</area>
+        </shape>
+
+        <shape name="track_info_background" from="basebackground">
+            <area>15,407,760,168</area>
+        </shape>
+
+        <textarea name="nostreams" from="basetextarea">
+            <area>25,20,740,160</area>
+            <multiline>yes</multiline>
+            <align>allcenter</align>
+            <value>Press MENU to add some radio streams to play.</value>
+        </textarea>
+
+        <buttonlist name="streamlist" from="basebuttonlist2">
+            <area>25,20,640,185</area>
+            <spacing>0</spacing>
+            <layout>vertical</layout>
+            <arrange>stack</arrange>
+            <showarrow>no</showarrow>
+            <buttonarea>0,0,520,180</buttonarea>
+            <statetype name="buttonitem">
+                <state name="active">
+                    <area>0,0,97%,46</area>
+
+                    <imagetype name="buttonimage">
+                        <area>5,5,36,36</area>
+                        <filename>mm_icecast.png</filename>
+                    </imagetype>
+
+                    <statetype name="playstate">
+                        <position>700,10</position>
+                        <state name="playing">
+                            <imagetype name="animation">
+                                <position>0,0</position>
+                                <filepattern low="1" high="8">mm_playing_%1.png</filepattern>
+                                <delay>160</delay>
+                            </imagetype>
+                        </state>
+                        <state name="paused">
+                            <imagetype name="animation">
+                                <position>5,5</position>
+                                <filename>mm_pauseicon.png</filename>
+                            </imagetype>
+                        </state>
+                        <state name="stopped">
+                            <imagetype name="animation">
+                                <position>5,5</position>
+                                <filename>mm_stopicon.png</filename>
+                            </imagetype>
+                        </state>
+                    </statetype>
+
+                    <textarea name="station" from="buttontext">
+                        <area>55,0,200,46</area>
+                        <align>left,vcenter</align>
+                        <font>basesmall</font>
+                    </textarea>
+                    <textarea name="channel" from="buttontext">
+                        <area>265,0,240,46</area>
+                        <font>basesmall</font>
+                        <align>left,vcenter</align>
+                    </textarea>
+                    <textarea name="genre" from="channel">
+                        <area>515,0,175,46</area>
+                        <align>left,vcenter</align>
+                        <font>basesmall</font>
+                    </textarea>
+
+                </state>
+                <state name="selectedactive" from="active">
+                    <imagetype name="buttonimage">
+                        <area>5,5,36,36</area>
+                        <filename>mm_icecast.png</filename>
+                    </imagetype>
+                    <shape name="selectbar">
+                        <area>0,0,100%,46</area>
+                    </shape>
+                </state>
+                <state name="selectedinactive" from="active">
+                    <shape name="selectbar">
+                        <area>0,0,100%,46</area>
+                    </shape>
+                </state>
+            </statetype>
+            <statetype name="upscrollarrow">
+                <position>675,183</position>
+            </statetype>
+            <statetype name="downscrollarrow">
+                <position>715,183</position>
+            </statetype>
+        </buttonlist>
+
+        <buttonlist name="playedtrackslist" from="basebuttonlist2">
+            <area>25,236,740,170</area>
+            <spacing>0</spacing>
+            <layout>vertical</layout>
+            <arrange>stack</arrange>
+            <showarrow>no</showarrow>
+            <buttonarea>0,0,740,170</buttonarea>
+            <statetype name="buttonitem">
+                <state name="active">
+                    <area>0,0,97%,46</area>
+
+                    <imagetype name="buttonimage">
+                        <area>5,5,36,36</area>
+                        <filename>mm_icecast.png</filename>
+                    </imagetype>
+
+                    <textarea name="tracknum" from="buttontext">
+                        <area>40,0,50,46</area>
+                        <align>right,vcenter</align>
+                        <template>%1 -</template>
+                    </textarea>
+
+                    <textarea name="title" from="buttontext">
+                        <area>100,0,240,46</area>
+                        <align>left,vcenter</align>
+                        <font>basesmall</font>
+                    </textarea>
+
+                    <textarea name="artist" from="buttontext">
+                        <area>350,0,280,46</area>
+                        <font>basesmall</font>
+                        <align>left,vcenter</align>
+                    </textarea>
+
+                    <textarea name="length" from="artist">
+                        <area>640,0,80,46</area>
+                        <align>right,vcenter</align>
+                        <font>basesmall</font>
+                    </textarea>
+
+                </state>
+                <state name="selectedactive" from="active">
+                    <imagetype name="buttonimage">
+                        <area>5,5,36,36</area>
+                        <filename>mm_icecast.png</filename>
+                    </imagetype>
+                    <shape name="selectbar">
+                        <area>0,0,100%,46</area>
+                    </shape>
+                </state>
+                <state name="selectedinactive" from="active">
+                    <shape name="selectbar">
+                        <area>0,0,100%,46</area>
+                    </shape>
+                </state>
+            </statetype>
+            <statetype name="upscrollarrow">
+                <position>675,140</position>
+            </statetype>
+            <statetype name="downscrollarrow">
+                <position>715,140</position>
+            </statetype>
+        </buttonlist>
+
+        <imagetype name="mm_blackhole_border">
+            <filename>mm_blackhole_border.png</filename>
+            <area>28,416,122,122</area>
+        </imagetype>
+
+        <textarea name="title" from="basetextarea">
+            <area>165,418,600,34</area>
+            <font>baselarge</font>
+        </textarea>
+
+        <textarea name="artist" from="basetextarea">
+            <area>165,455,473,34</area>
+            <font>basemedium</font>
+        </textarea>
+
+        <textarea name="channel" from="basetextarea">
+            <area>165,489,473,34</area>
+            <font>basemedium</font>
+            <template>%STATION% - %CHANNEL%</template>
+        </textarea>
+
+        <textarea name="filename" from="basetextarea">
+            <font>basesmall</font>
+            <area>165,522,370,35</area>
+        </textarea>
+
+        <progressbar name="bufferprogress">
+            <position>130,548</position>
+            <layout>horizontal</layout>
+           <style>reveal</style>
+            <imagetype name="background">
+                <filename>mm_progress-bg.png</filename>
+            </imagetype>
+            <imagetype name="progressimage">
+                <filename>mm_progress-fg.png</filename>
+            </imagetype>
+        </progressbar>
+
+	<!-- removed because screen is flickering when buffer status is being updated
+        <textarea name="bufferstatus" from="basetextarea">
+            <area>540,543,400,35</area>
+            <font>basesmall</font>
+            <value>0</value>
+	</textarea>
+	-->
+
+        <imagetype name="visualizer_border">
+            <filename>mm_blackhole_border.png</filename>
+            <area>648,456,112,112,</area>
+        </imagetype>
+
+        <video name="visualizer">
+            <area>651,460,106,105,</area>
+        </video>
+
+        <textarea name="visualizername" from="basetextarea">
+            <area>651,460,106,105</area>
+            <font>basesmall</font>
+            <align>allcenter</align>
+        </textarea>
+
+        <textarea name="volume" from="basevolume">
+            <position>70,548</position>
+        </textarea>
+
+        <statetype name="mutestate" from="basemutestate">
+            <position>30,548</position>
+        </statetype>
+
+        <imagetype name="coverart">
+            <filename>mm_nothumb.png</filename>
+            <area>30,418,118,118</area>
+        </imagetype>
+
+	<button name="play"> <!--from="baseplaybutton"> is not available yet -->
+            <position>545,525</position>
+	    <statetype name="buttonstate">
+		    <state name="active">
+			    <imagetype name="background">
+				    <filename>play_button_off.png</filename>
+			    </imagetype>
+		    </state>
+		    <state name="selected" from="active">
+			    <imagetype name="background">
+				    <filename>play_button_on.png</filename>
+			    </imagetype>
+		    </state>
+		    <state name="disabled" from="active" />
+		    <state name="pushed" from="active">
+			    <imagetype name="background">
+				    <filename>play_button_pushed.png</filename>
+			    </imagetype>
+		    </state>
+	    </statetype>
+        </button>
+
+	<button name="stop"> <!-- from="basestopbutton"> is not available yet -->
+            <position>590,525</position>
+	    <statetype name="buttonstate">
+		    <state name="active">
+			    <imagetype name="background">
+				    <filename>stop_button_off.png</filename>
+			    </imagetype>
+		    </state>
+		    <state name="selected" from="active">
+			    <imagetype name="background">
+				    <filename>stop_button_on.png</filename>
+			    </imagetype>
+		    </state>
+		    <state name="disabled" from="active" />
+		    <state name="pushed" from="active">
+			    <imagetype name="background">
+				    <filename>stop_button_pushed.png</filename>
+			    </imagetype>
+		    </state>
+	    </statetype>
+        </button>
+
+    </window>
+
+    <window name="editstreammetadata">
+
+        <textarea name="title" from="basetextarea">
+            <area>15,15,760,50</area>
+            <font>baselarge</font>
+            <value>Add/Edit Music Stream</value>
+        </textarea>
+
+        <textarea name="stationlabel" >
+            <area>15,95,260,50</area>
+            <font>basemedium</font>
+            <align>right,vcenter</align>
+            <value>Station:</value>
+        </textarea>
+        <textedit name="stationedit" from="basetextedit">
+            <position>310,95</position>
+        </textedit>
+
+        <button name="searchbutton" from="basewidebutton">
+            <position>396,154</position>
+            <value>Search for Stream</value>
+        </button>
+
+        <textarea name="channellabel" from="stationlabel">
+            <position>15,206</position>
+            <value>Channel:</value>
+        </textarea>
+        <textedit name="channeledit" from="stationedit">
+            <position>310,206</position>
+        </textedit>
+
+        <textarea name="urllabel" from="stationlabel">
+            <position>15,266</position>
+            <value>URL:</value>
+        </textarea>
+        <textedit name="urledit" from="stationedit">
+            <area>310,266,700,50</area>
+        </textedit>
+
+        <textarea name="logourllabel" from="stationlabel">
+            <position>15,326</position>
+            <value>Logo URL:</value>
+        </textarea>
+        <textedit name="logourledit" from="urledit">
+            <position>310,326</position>
+        </textedit>
+
+        <textarea name="genrelabel" from="stationlabel">
+            <position>15,386</position>
+            <value>Genres:</value>
+        </textarea>
+        <textedit name="genreedit" from="urledit">
+            <position>310,386</position>
+        </textedit>
+
+        <textarea name="formatlabel" from="stationlabel">
+            <position>15,446</position>
+            <value>Metadata Format:</value>
+        </textarea>
+        <textedit name="formatedit" from="stationedit">
+            <position>310,446</position>
+        </textedit>
+
+        <button name="cancelbutton" from="basebutton">
+            <position>310,520</position>
+            <value>Cancel</value>
+        </button>
+
+        <button name="savebutton" from="basebutton">
+            <position>535,520</position>
+            <value>Save</value>
+        </button>
+
+    </window>
+
+    <window name="searchstream">
+
+        <textarea name="title" from="basetextarea">
+            <area>15,15,760,50</area>
+            <font>baselarge</font>
+            <value>Search for Music Stream</value>
+        </textarea>
+
+        <textarea name="stationlabel" >
+            <area>20,53,120,50</area>
+            <font>basemedium</font>
+            <align>right,vcenter</align>
+            <value>Station:</value>
+        </textarea>
+        <buttonlist name="stationlist" from="basemediumselector">
+            <position>150,56</position>
+        </buttonlist>
+
+        <textarea name="genrelabel" from="stationlabel">
+            <position>20,108</position>
+            <value>Genre:</value>
+        </textarea>
+        <buttonlist name="genrelist" from="basemediumselector">
+            <position>150,111</position>
+        </buttonlist>
+
+        <textarea name="channellabel" from="stationlabel">
+            <position>20,166</position>
+            <value>Channel:</value>
+        </textarea>
+        <textedit name="channeledit" from="basetextedit">
+            <position>150,166</position>
+        </textedit>
+
+        <textarea name="matcheslable" from="stationlabel">
+            <area>520,146,270,50</area>
+            <align>right,vcenter</align>
+            <value>Matches:</value>
+        </textarea>
+
+        <textarea name="matchestext" from="stationlabel">
+            <area>670,176,100,50</area>
+            <align>left,vcenter</align>
+        </textarea>
+
+        <buttonlist name="streamlist" from="basebuttonlist2">
+            <area>20,235,760,345</area>
+            <spacing>0</spacing>
+            <layout>vertical</layout>
+            <arrange>stack</arrange>
+            <showarrow>no</showarrow>
+            <searchposition>-1,50</searchposition>
+            <buttonarea>0,0,740,335</buttonarea>
+            <statetype name="buttonitem">
+                <state name="active">
+                    <area>0,0,100%,46</area>
+                    <imagetype name="buttonimage">
+                        <area>5,5,36,36</area>
+                        <filename>mm_icecast.png</filename>
+                    </imagetype>
+
+                    <statetype name="selectedstate">
+                        <position>730,10</position>
+                        <state name="off"></state>
+                        <state name="on">
+                            <imagetype name="statusimage">
+                                <filename>playlist_yes.png</filename>
+                            </imagetype>
+                        </state>
+                    </statetype>
+
+                    <textarea name="station" from="buttontext">
+                        <area>50,0,300,46</area>
+                        <align>left,vcenter</align>
+                        <font>basesmall</font>
+                        <template>%STATION% - %Channel%</template>
+                    </textarea>
+
+                    <textarea name="genre" from="buttontext">
+                        <area>360,0,300,46</area>
+                        <align>left,vcenter</align>
+                        <font>basesmall</font>
+                    </textarea>
+
+                </state>
+                <state name="selectedactive" from="active">
+                    <imagetype name="buttonimage">
+                        <area>5,5,36,36</area>
+                        <filename>mm_icecast.png</filename>
+                    </imagetype>
+                    <shape name="selectbar">
+                        <area>0,0,730,46</area>
+                    </shape>
+                </state>
+                <state name="selectedinactive" from="active">
+                    <shape name="selectbar">
+                        <area>0,0,730,46</area>
+                    </shape>
+                </state>
+            </statetype>
+
+            <statetype name="upscrollarrow">
+                <position>700,325</position>
+            </statetype>
+
+            <statetype name="downscrollarrow">
+                <position>730,325</position>
+            </statetype>
+        </buttonlist>
+
+
+    </window>
+
+</mythuitheme>