diff --git a/components/HomeScene.brs b/components/HomeScene.brs
index 972b833..23f5d85 100644
--- a/components/HomeScene.brs
+++ b/components/HomeScene.brs
@@ -32,7 +32,7 @@ end sub
 function ShowView(selectedIndex as integer)
   viewToShow = "NTunesScene"
 
-  if selectedIndex = 0 then
+  if selectedIndex = 0 or selectedIndex = 1 then
     updateTheme("0x121212FF")
   end if
 
diff --git a/components/HorizonsScene.brs b/components/HorizonsScene.brs
index 92785bf..fb3b9e4 100644
--- a/components/HorizonsScene.brs
+++ b/components/HorizonsScene.brs
@@ -17,7 +17,7 @@ sub OnWasShown()
   m.left_side_row_2_status = m.top.findNode("left_side_row_2_status")
 
   audiocontent = createObject("RoSGNode", "ContentNode")
-  audiocontent.url = "https://cdn3.wdwnt.com/music/Epcot%20-%20Horizons%20(Full%20Audio).mp3"
+  audiocontent.url = "https://appcdn.wdwnt.com/roku/music/Epcot%20-%20Horizons%20(Full%20Audio).mp3"
 
   m.audio = m.top.findNode("audio")
   m.audio.content = audiocontent
diff --git a/components/NTunesScene.brs b/components/NTunesScene.brs
index f392a3d..8968baa 100644
--- a/components/NTunesScene.brs
+++ b/components/NTunesScene.brs
@@ -21,8 +21,6 @@ function setUpLabels() as void
   m.current_track_artist_name = m.top.findNode("current_track_artist_name")
   m.current_show_name = m.top.findNode("current_show_name")
   m.current_show_image_path = m.top.findNode("current_show_image_path")
-  m.next_track_title = m.top.findNode("next_track_title")
-  m.next_track_artist_name = m.top.findNode("next_track_artist_name")
 
   m.audio_indicator = m.top.findNode("audio_indicator")
 end function
@@ -40,7 +38,7 @@ end function
 
 function setUpAudio() as void
   audiocontent = createObject("RoSGNode", "ContentNode")
-  audiocontent.url = "https://wdwnt.out.airtime.pro/wdwnt_a"
+  audiocontent.url = "https://streaming.live365.com/a31769"
 
   m.audio = m.top.findNode("audio_player")
   m.audio.content = audiocontent
@@ -79,6 +77,4 @@ sub onCurrentInfoChanged()
   m.current_track_artist_name.text = current_info.current_track_artist_name
   m.current_show_name.text = current_info.current_show_name
   m.current_show_image_path.uri = current_info.current_show_image_path
-  m.next_track_title.text = current_info.next_track_title
-  m.next_track_artist_name.text = current_info.next_track_artist_name
 end sub
diff --git a/components/NTunesScene.xml b/components/NTunesScene.xml
index e18d58c..f569b09 100644
--- a/components/NTunesScene.xml
+++ b/components/NTunesScene.xml
@@ -2,88 +2,67 @@
 <component name="NTunesScene" extends="SGDEXComponent" xsi:noNamespaceSchemaLocation="https://devtools.web.roku.com/schema/RokuSceneGraph.xsd" initialFocus="audio_control_button">
     <script type="text/brightscript" uri="pkg:/components/NTunesScene.brs" />
     <children>
-        <Group id="ntunesGroup">
-            <Group id="artwork">
-                <Poster
-                    id="current_show_image_path"
-                    width="500"
-                    height="500"
-                    translation="[100, 100]" />
-            </Group>
-            <Group id="song_info" translation="[700, 100]">
-                <Label id="title" text="Now Playing" color="0xFFFFFFFF">
-                    <Font
-                        role="font"
-                        uri="pkg:/components/fonts/avenir_85_heavy_latin.ttf"
-                        id="avenir-light"
-                        size="80"
-                    />
-                </Label>
-                <LayoutGroup translation="[0, 120]">
-                    <Label id="current_show_name" color="0xFFFFFFFF">
-                        <Font
-                            role="font"
-                            uri="pkg:/components/fonts/avenir_35_light_latin.ttf"
-                            id="avenir-light"
-                            size="30"
-                        />
-                    </Label>
-                    <Label id="current_track_title" text="Loading..." color="0xFFFFFFFF" width="1200" wrap="true">
-                        <Font
-                            role="font"
-                            uri="pkg:/components/fonts/avenir_45_book_latin.ttf"
-                            id="avenir-light"
-                            size="65"
-                        />
-                    </Label>
-                    <Label id="current_track_artist_name" color="0xFFFFFFFF">
-                        <Font
-                            role="font"
-                            uri="pkg:/components/fonts/avenir_35_light_latin.ttf"
-                            id="avenir-light"
-                            size="40"
-                        />
-                    </Label>
-                </LayoutGroup>
-                <LayoutGroup translation="[0, 400]">
-                    <Label id="next_track_info_title" text="Up Next" color="0xFFFFFFFF">
-                        <Font
-                            role="font"
-                            uri="pkg:/components/fonts/avenir_45_book_latin.ttf"
-                            id="avenir-light"
-                            size="45"
-                        />
-                    </Label>
-                    <Label id="next_track_title" color="0xFFFFFFFF">
-                        <Font
-                            role="font"
-                            uri="pkg:/components/fonts/avenir_35_light_latin.ttf"
-                            id="avenir-light"
-                            size="30"
-                        />
-                    </Label>
-                    <Label id="next_track_artist_name" color="0xFFFFFFFF">
-                        <Font
-                            role="font"
-                            uri="pkg:/components/fonts/avenir_35_light_latin.ttf"
-                            id="avenir-light"
-                            size="30"
-                        />
-                    </Label>
-                </LayoutGroup>
-            </Group>
-            <Group id="audio_indicator_group" translation="[960, 900]">
-                <Label id="audio_indicator" text="N" color="0xFFFFFFFF">
-                    <Font
-                        role="font"
-                        uri="pkg:/components/fonts/sosa-regular-webfont.ttf"
-                        id="sosa-regular"
-                        size="150"
-                    />
-                </Label>
-            </Group>
+        <Label id="title"
+            text="Now Playing"
+            color="0xFFFFFFFF"
+            translation="[20, 20]">
+            <Font
+                role="font"
+                uri="pkg:/components/fonts/avenir_35_light_latin.ttf"
+                id="avenir-light"
+                size="30"
+            />
+        </Label>
+        <Poster
+            id="current_show_image_path"
+            width="500"
+            height="500"
+            translation="[710, 100]" />
+        <LayoutGroup translation="[0, 650]">
+            <Label id="current_show_name"
+                color="0xFFFFFFFF"
+                horizAlign="center"
+                width="1920">
+                <Font
+                    role="font"
+                    uri="pkg:/components/fonts/avenir_35_light_latin.ttf"
+                    id="avenir-light"
+                    size="30"
+                />
+            </Label>
+            <Label id="current_track_title" text="Loading..."
+                color="0xFFFFFFFF"
+                horizAlign="center"
+                width="1920"
+                wrap="true">
+                <Font
+                    role="font"
+                    uri="pkg:/components/fonts/avenir_85_heavy_latin.ttf"
+                    id="avenir-heavy-latin"
+                    size="65"
+                />
+            </Label>
+            <Label id="current_track_artist_name"
+                color="0xFFFFFFFF"
+                horizAlign="center"
+                width="1920">
+                <Font
+                    role="font"
+                    uri="pkg:/components/fonts/avenir_35_light_latin.ttf"
+                    id="avenir-light"
+                    size="40"
+                />
+            </Label>
+            <Label id="audio_indicator" text="N" color="0xFFFFFFFF" horizAlign="center" width="1920">
+                <Font
+                    role="font"
+                    uri="pkg:/components/fonts/sosa-regular-webfont.ttf"
+                    id="sosa-regular"
+                    size="150"
+                />
+            </Label>
             <Audio id="audio_player" />
             <Timer id="refresh_timer" repeat="true" duration="10" />
-        </Group>
+        </LayoutGroup>
     </children>
 </component>
diff --git a/components/PodcastScene.brs b/components/PodcastScene.brs
index 55f4b39..1ad8b25 100644
--- a/components/PodcastScene.brs
+++ b/components/PodcastScene.brs
@@ -4,7 +4,6 @@ end sub
 
 sub OnWasShown()
   m.play_bar = m.top.findNode("play_bar")
-  m.show_art = m.top.findNode("show_art")
   m.Play = m.top.findNode("Play")
 
   ' m.global.observeField("FF", "FF")
@@ -37,7 +36,6 @@ end function
 sub updateFocused()
   episode = getSelectedEpisode()
 
-  m.show_art.uri = episode.hdPosterUrl
   m.episode_title.text = episode.title
   m.episode_description.text = episode.Description
 end sub
@@ -53,26 +51,26 @@ sub playaudio()
   m.Play.text = "O"
 end sub
 
-sub controlaudioplay()
-  if (m.audio.state = "finished")
-    m.audio.control = "stop"
-    m.audio.control = "none"
-    m.Play.text = "N"
-  end if
-end sub
+' sub controlaudioplay()
+'   if (m.audio.state = "finished")
+'     m.audio.control = "stop"
+'     m.audio.control = "none"
+'     m.Play.text = "N"
+'   end if
+' end sub
 
-function onKeyEvent(key as String,press as Boolean) as Boolean
-  if press then
-    if key = "back"
-      if (m.audio.state = "playing")
-        m.audio.control = "stop"
-        m.Play.text = "N"
-        return true
-      end if
-    end if
-  end if
-  return false
-end function
+' function onKeyEvent(key as String,press as Boolean) as Boolean
+'   if press then
+'     if key = "back"
+'       if (m.audio.state = "playing")
+'         m.audio.control = "stop"
+'         m.Play.text = "N"
+'         return true
+'       end if
+'     end if
+'   end if
+'   return false
+' end function
 
 ' sub FF()
 '     skip10Seconds(true)
diff --git a/components/PodcastScene.xml b/components/PodcastScene.xml
index 5822894..4427f8f 100644
--- a/components/PodcastScene.xml
+++ b/components/PodcastScene.xml
@@ -5,19 +5,14 @@
         <Group>
 			<PosterGrid
 				id="audioLabelList"
-				translation="[20, 20]"
-				basePosterSize="[340, 340]"
-				itemSpacing="[16, 16]"
-				caption1NumLines="1"
-				numColumns="3"
-				numRows="2">
-				<Font
-                    role="caption1Font"
-                    uri="pkg:/components/fonts/avenir_35_light_latin.ttf"
-                    id="avenir-light"
-                    size="30" />
+				height="1000"
+				translation="[40, 40]"
+				basePosterSize="[240, 240]"
+				itemSpacing="[10, 10]"
+				numColumns="4"
+				numRows="5">
 			</PosterGrid>
-			<LayoutGroup itemSpacings="[0, 40]" translation="[1100, 20]">
+			<LayoutGroup itemSpacings="[30]" translation="[1100, 40]">
 				<Label
 					id="episode_title"
 					width="800"
@@ -25,9 +20,9 @@
 					color="0xFFFFFFFF">
 					<Font
 						role="font"
-						uri="pkg:/components/fonts/avenir_35_light_latin.ttf"
-						id="avenir-light"
-						size="34" />
+						uri="pkg:/components/fonts/avenir_85_heavy_latin.ttf"
+						id="avenir-heavy-latin"
+						size="32" />
 				</Label>
 				<Label
 					id="episode_description"
@@ -36,67 +31,11 @@
 					color="0xFFFFFFFF">
 					<Font
 						role="font"
-						uri="pkg:/components/fonts/avenir_35_light_latin.ttf"
-						id="avenir-light"
-						size="28" />
+						uri="pkg:/components/fonts/avenir_45_book_latin.ttf"
+						id="avenir-book-latin"
+						size="24" />
 				</Label>
 			</LayoutGroup>
         </Group>
-        <Group translation="[0, -30]">
-            <Rectangle
-				id="play_bar"
-				height="200"
-				width="1920"
-				color="0x000000FF"
-				opacity="0.8"
-				translation="[0,930]">
-                <Poster
-					id="show_art"
-					height="150"
-					width="150"
-					loadWidth="150"
-					loadHeight="150"
-					translation="[42, 15]" />
-                <Label
-					id="Play"
-					color="0xFFFFFFFF"
-					width="100"
-					height="120"
-					text="N"
-					translation="[910, 35]">
-					<Font
-						id="Sosa-Regular"
-						role="font"
-						uri="pkg:/components/fonts/sosa-regular-webfont.ttf"
-						size="90" />
-				</Label>
-				<Label
-					id="FF"
-					color="0xFFFFFFFF"
-					width="100"
-					height="120"
-					text="T"
-					translation="[810, 35]">
-					<Font
-						id="Sosa-Regular"
-						role="font"
-						uri="pkg:/components/fonts/sosa-regular-webfont.ttf"
-						size="90" />
-				</Label>
-				<Label
-					id="Rewind"
-					color="0xFFFFFFFF"
-					width="100"
-					height="120"
-					text="S"
-					translation="[1010, 35]">
-					<Font
-						id="Sosa-Regular"
-						role="font"
-						uri="pkg:/components/fonts/sosa-regular-webfont.ttf"
-						size="90" />
-				</Label>
-            </Rectangle>
-        </Group>
   </children>
 </component>
diff --git a/components/TodayScene.brs b/components/TodayScene.brs
index 526b747..75f0898 100644
--- a/components/TodayScene.brs
+++ b/components/TodayScene.brs
@@ -158,7 +158,7 @@ end sub
 
 sub changeAudioTrack()
   audiocontent = createObject("RoSGNode", "ContentNode")
-  audiocontent.url = "https://cdn3.wdwnt.com/music/resort_tv/" + m.audio_track_index.ToStr() + ".mp3"
+  audiocontent.url = "https://appcdn.wdwnt.com/roku/music/resort_tv/" + m.audio_track_index.ToStr() + ".mp3"
 
   m.audio.content = audiocontent
   m.audio.control = "play"
diff --git a/components/TodayScene.xml b/components/TodayScene.xml
index 063d773..5c4d7d6 100644
--- a/components/TodayScene.xml
+++ b/components/TodayScene.xml
@@ -56,7 +56,7 @@
                                 role="font"
                                 uri="pkg:/components/fonts/avenir_35_light_latin.ttf"
                                 id="avenir-light"
-                                size="40"
+                                size="30"
                             />
                         </Label>
                         <Poster id="weather_icon" width="50" height="50" />
diff --git a/components/config/menu.json b/components/config/menu.json
index 4d8983e..1b16882 100644
--- a/components/config/menu.json
+++ b/components/config/menu.json
@@ -3,21 +3,21 @@
 		"id": 0,
 		"title": "WDWNTunes",
 		"shortDescription": "Broadcasting Magic, Music, and Mayhem",
-		"thumbnail": "https://cdn3.wdwnt.com/images/WDWNTunes_600x334.png"
+		"thumbnail": "https://appcdn.wdwnt.com/roku/images/WDWNTunes_600x334.png"
 	}, {
 		"id": 1,
 		"title": "Podcasts",
 		"shortDescription": "Listen to the latest news and shows from WDWNT",
-		"thumbnail": "https://cdn3.wdwnt.com/images/podcast-cover-photo_600x334.png"
+		"thumbnail": "https://appcdn.wdwnt.com/roku/images/podcast-cover-photo_600x334.png"
 	}, {
 		"id": 2,
 		"title": "Today at WDW",
 		"shortDescription": "View today's park hours as you would on resort TV!",
-		"thumbnail": "https://cdn3.wdwnt.com/images/now/theme-park/80007944/01.jpg"
+		"thumbnail": "https://nowassets.wdwnt.com/images/theme-park/80007944/01.jpg"
 	}, {
 		"id": 3,
 		"title": "Horizons 1",
 		"shortDescription": "A fun display that resembles the board at the entrance of Horizons",
-		"thumbnail": "https://cdn3.wdwnt.com/images/misc/horizons.jpg"
+		"thumbnail": "https://appcdn.wdwnt.com/roku/images/misc/horizons.jpg"
 	}]
 }
\ No newline at end of file
diff --git a/components/tasks/NTunesTask.brs b/components/tasks/NTunesTask.brs
index 950cac5..1f56677 100644
--- a/components/tasks/NTunesTask.brs
+++ b/components/tasks/NTunesTask.brs
@@ -1,16 +1,14 @@
 function executeTask() as void
-  urlTransfer = createUrlTransfer("https://fastpass.wdwnt.com/radio")
+  urlTransfer = createUrlTransfer("https://fastpass.wdwnt.com/live365")
   json = getJson(urlTransfer)
 
   ntunes_info = CreateObject("roAssociativeArray")
   current_info = CreateObject("roSGNode", "NTunesNode")
 
-  current_info.current_track_title = json.current.metadata.track_title
-  current_info.current_track_artist_name = json.current.metadata.artist_name
-  current_info.current_show_name = json.currentShow[0].name
-  current_info.current_show_image_path = json.currentShow[0].image_path
-  current_info.next_track_title = json["next"].metadata.track_title
-  current_info.next_track_artist_name = json["next"].metadata.artist_name
+  current_info.current_track_title = json["current-track"].title
+  current_info.current_track_artist_name = json["current-track"].artist
+  current_info.current_show_name = ""
+  current_info.current_show_image_path = json["current-track"].art
 
   ntunes_info.AddReplace("ntunes", current_info)
 
diff --git a/components/tasks/PodcastTask.brs b/components/tasks/PodcastTask.brs
index e70afc2..38ddb74 100644
--- a/components/tasks/PodcastTask.brs
+++ b/components/tasks/PodcastTask.brs
@@ -5,6 +5,7 @@ function executeTask() as void
   content = createObject("roSGNode", "ContentNode")
   htmlRegex = CreateObject("roRegex", "<.*?>", "")
   apostropheRegex = CreateObject("roRegex", "&#8217;", "")
+  carriageReturnRegex = CreateObject("roRegex", "\n\n", "")
 
   for each podcast in json
     podcast_content = content.CreateChild("ContentNode")
@@ -16,6 +17,7 @@ function executeTask() as void
 
     description = htmlRegex.ReplaceAll(podcast.content, "")
     description = apostropheRegex.ReplaceAll(description, "'")
+    description = carriageReturnRegex.ReplaceAll(description, chr(10))
     podcast_content.Description = description
   end for