diff --git a/addon.xml b/addon.xml
index 6cb4f7ae..6496fda0 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon  id="plugin.video.mb3sync" 
-        name="MediaBrowser Syncer" 
+        name="Emby Syncer" 
         version="0.0.1" 
-        provider-name="mediabrowser.tv">
+        provider-name="Emby.media">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
   </requires>
diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
index 00814d50..d6b8a02e 100644
--- a/resources/language/English/strings.xml
+++ b/resources/language/English/strings.xml
@@ -12,7 +12,7 @@
     <string id="30010">Enable Performance Profiling</string>
     <string id="30011">Local caching system</string>
 
-    <string id="30014">MediaBrowser</string>
+    <string id="30014">Emby</string>
     <string id="30015">Network</string>    
     <string id="30016">Device Name</string>        
 
@@ -233,6 +233,10 @@
     <string id="30233">Don't Show Skin Compatibility Message</string>
     <string id="30234">Add Show Name (Season + Episode)</string>
     
+    <string id="30235">Extras</string>
+    <string id="30236">Sync Theme Music</string>
+    <string id="30237">Sync Extra Fanart</string>
+    
 	<!-- Default views -->
     <string id="30300">Active</string>              
     <string id="30301">Clear Settings</string>              
diff --git a/resources/lib/WriteKodiDB.py b/resources/lib/WriteKodiDB.py
index 99be3ad4..4235a761 100644
--- a/resources/lib/WriteKodiDB.py
+++ b/resources/lib/WriteKodiDB.py
@@ -168,6 +168,10 @@ class WriteKodiDB():
         CreateFiles().createSTRM(MBitem)
         CreateFiles().createNFO(MBitem)
         
+        #add theme music
+        if addon.getSetting("syncThemeMusic") == "true":
+            CreateFiles().copyThemeMusic(MBitem)
+        
         if(changes):
             utils.logMsg("Updated item to Kodi Library", MBitem["Id"] + " - " + MBitem["Name"], level=0)
             
@@ -307,6 +311,10 @@ class WriteKodiDB():
         CreateFiles().createSTRM(MBitem)
         CreateFiles().createNFO(MBitem)
         
+        #add theme music
+        if addon.getSetting("syncThemeMusic") == "true":
+            CreateFiles().copyThemeMusic(MBitem)
+        
         if changes:
             utils.logMsg("Updated item to Kodi Library", MBitem["Id"] + " - " + MBitem["Name"])
         
@@ -368,6 +376,10 @@ class WriteKodiDB():
         
         CreateFiles().createNFO(MBitem)
         
+        #add theme music
+        if addon.getSetting("syncThemeMusic") == "true":
+            CreateFiles().copyThemeMusic(MBitem)
+        
         if changes:
             utils.logMsg("Updated item to Kodi Library", MBitem["Id"] + " - " + MBitem["Name"])
             
@@ -683,9 +695,6 @@ class WriteKodiDB():
         # create strm file
         changes |= CreateFiles().createSTRM(item)
         
-        #add theme music
-        CreateFiles().copyThemeMusic(item)
-        
         if changes:
             utils.logMsg("MB3 Sync","Added movie to Kodi Library",item["Id"] + " - " + item["Name"])
     
@@ -771,9 +780,6 @@ class WriteKodiDB():
         #create nfo file
         changes = CreateFiles().createNFO(item)
         
-        #add theme music
-        CreateFiles().copyThemeMusic(item)
-        
         if changes:
             utils.logMsg("Added TV Show to Kodi Library ",item["Id"] + " - " + item["Name"])
         
diff --git a/resources/settings.xml b/resources/settings.xml
index d13ed3c6..db460547 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -15,7 +15,7 @@
         <setting id="playCountSyncIndication" type="labelenum" label="Play Count Sync Indication:" values="None|Notify OnChange|Notify OnFinish|BG Progress|Dialog Progress" default="None" />
 	</category>
 
-	<category label="30014"> <!-- MediaBrowser -->
+	<category label="30014"> <!-- Emby -->
 		<setting id="ipaddress" type="text" label="30000" default="" visible="true" enable="true" />
 		<setting id="port" type="text" label="30030" default="8096" visible="true" enable="true" />
 		<setting id="https" type="bool" label="Enable HTTPS" visible="true" enable="true" />
@@ -24,6 +24,11 @@
         <setting type="sep" />
         <setting id="deviceName" type="text" label="30016" default="Kodi"/>
 	</category>
+	
+	<category label="30235"> <!-- Extra Sync options -->
+		<setting id="syncThemeMusic" type="bool" label="30236" default="false" visible="true" enable="true" />
+		<!--  <setting id="syncExtraFanart" type="bool" label="30237" default="false" visible="true" enable="true" /> -->
+	</category>
 
 	<category label="30022"> <!-- Advanced -->
 		<setting id="logLevel" type="enum" label="30004" values="None|Info|Debug" default="0" />