diff --git a/Mage.Client/release/music/sample1.mp3 b/Mage.Client/release/music/sample1.mp3
new file mode 100644
index 0000000000..37008a543b
Binary files /dev/null and b/Mage.Client/release/music/sample1.mp3 differ
diff --git a/Mage.Client/release/music/sample2.mp3 b/Mage.Client/release/music/sample2.mp3
new file mode 100644
index 0000000000..87d56b2f17
Binary files /dev/null and b/Mage.Client/release/music/sample2.mp3 differ
diff --git a/Mage.Client/release/music/sample3.mp3 b/Mage.Client/release/music/sample3.mp3
new file mode 100644
index 0000000000..7f0f959a56
Binary files /dev/null and b/Mage.Client/release/music/sample3.mp3 differ
diff --git a/Mage.Client/release/sample-decks/2013/Standard/DailyMTG/Sami Häggkvist's WRB Midrange.dck b/Mage.Client/release/sample-decks/2013/Standard/DailyMTG/Sami Häggkvist's WRB Midrange.dck
deleted file mode 100644
index 5720198d3e..0000000000
--- a/Mage.Client/release/sample-decks/2013/Standard/DailyMTG/Sami Häggkvist's WRB Midrange.dck	
+++ /dev/null
@@ -1,31 +0,0 @@
-NAME:Sami Häggkvist's WRB Midrange
-4 [GTC:215] Boros Reckoner
-2 [ISD:105] Liliana of the Veil
-1 [DKA:158] Vault of the Archangel
-4 [M13:222] Dragonskull Summit
-1 [RTR:1] Angel of Serenity
-2 [RTR:82] Ultimate Price
-2 [ISD:215] Olivia Voldaren
-2 [RTR:188] Rakdos's Return
-2 [RTR:265] Mountain
-4 [DKA:12] Lingering Souls
-4 [DKA:87] Faithless Looting
-2 [AVR:32] Restoration Angel
-4 [ISD:242] Isolated Chapel
-3 [ISD:238] Clifftop Retreat
-4 [RTR:238] Blood Crypt
-3 [RTR:101] Mizzium Mortars
-2 [RTR:157] Dreadbore
-2 [GTC:182] Obzedat, Ghost Council
-4 [GTC:242] Godless Shrine
-2 [ISD:122] Unburial Rites
-2 [M13:150] Thundermaw Hellkite
-4 [GTC:245] Sacred Foundry
-SB: 2 [AVR:104] Gloom Surgeon
-SB: 1 [RTR:93] Electrickery
-SB: 4 [AVR:84] Appetite for Brains
-SB: 2 [M13:107] Rise from the Grave
-SB: 1 [ISD:27] Purify the Grave
-SB: 2 [M13:90] Duress
-SB: 2 [RTR:197] Slaughter Games
-SB: 1 [M13:22] Oblivion Ring
diff --git a/Mage.Client/plugins/sounds/OnAddArtifact.wav b/Mage.Client/release/sounds/OnAddArtifact.wav
similarity index 100%
rename from Mage.Client/plugins/sounds/OnAddArtifact.wav
rename to Mage.Client/release/sounds/OnAddArtifact.wav
diff --git a/Mage.Client/plugins/sounds/OnAddPermanent.wav b/Mage.Client/release/sounds/OnAddPermanent.wav
similarity index 100%
rename from Mage.Client/plugins/sounds/OnAddPermanent.wav
rename to Mage.Client/release/sounds/OnAddPermanent.wav
diff --git a/Mage.Client/plugins/sounds/OnAttack.wav b/Mage.Client/release/sounds/OnAttack.wav
similarity index 100%
rename from Mage.Client/plugins/sounds/OnAttack.wav
rename to Mage.Client/release/sounds/OnAttack.wav
diff --git a/Mage.Client/plugins/sounds/OnBlock.wav b/Mage.Client/release/sounds/OnBlock.wav
similarity index 100%
rename from Mage.Client/plugins/sounds/OnBlock.wav
rename to Mage.Client/release/sounds/OnBlock.wav
diff --git a/Mage.Client/plugins/sounds/OnButtonCancel.wav b/Mage.Client/release/sounds/OnButtonCancel.wav
similarity index 100%
rename from Mage.Client/plugins/sounds/OnButtonCancel.wav
rename to Mage.Client/release/sounds/OnButtonCancel.wav
diff --git a/Mage.Client/plugins/sounds/OnButtonOk.wav b/Mage.Client/release/sounds/OnButtonOk.wav
similarity index 100%
rename from Mage.Client/plugins/sounds/OnButtonOk.wav
rename to Mage.Client/release/sounds/OnButtonOk.wav
diff --git a/Mage.Client/plugins/sounds/OnDraw.wav b/Mage.Client/release/sounds/OnDraw.wav
similarity index 100%
rename from Mage.Client/plugins/sounds/OnDraw.wav
rename to Mage.Client/release/sounds/OnDraw.wav
diff --git a/Mage.Client/plugins/sounds/OnEndTurn.wav b/Mage.Client/release/sounds/OnEndTurn.wav
similarity index 100%
rename from Mage.Client/plugins/sounds/OnEndTurn.wav
rename to Mage.Client/release/sounds/OnEndTurn.wav
diff --git a/Mage.Client/plugins/sounds/OnHover.wav b/Mage.Client/release/sounds/OnHover.wav
similarity index 100%
rename from Mage.Client/plugins/sounds/OnHover.wav
rename to Mage.Client/release/sounds/OnHover.wav
diff --git a/Mage.Client/plugins/sounds/OnNextPage.wav b/Mage.Client/release/sounds/OnNextPage.wav
similarity index 100%
rename from Mage.Client/plugins/sounds/OnNextPage.wav
rename to Mage.Client/release/sounds/OnNextPage.wav
diff --git a/Mage.Client/plugins/sounds/OnNextPhase.wav b/Mage.Client/release/sounds/OnNextPhase.wav
similarity index 100%
rename from Mage.Client/plugins/sounds/OnNextPhase.wav
rename to Mage.Client/release/sounds/OnNextPhase.wav
diff --git a/Mage.Client/plugins/sounds/OnPlayerJoinedTable.wav b/Mage.Client/release/sounds/OnPlayerJoinedTable.wav
similarity index 100%
rename from Mage.Client/plugins/sounds/OnPlayerJoinedTable.wav
rename to Mage.Client/release/sounds/OnPlayerJoinedTable.wav
diff --git a/Mage.Client/plugins/sounds/OnPrevPage.wav b/Mage.Client/release/sounds/OnPrevPage.wav
similarity index 100%
rename from Mage.Client/plugins/sounds/OnPrevPage.wav
rename to Mage.Client/release/sounds/OnPrevPage.wav
diff --git a/Mage.Client/plugins/sounds/OnStackNew.wav b/Mage.Client/release/sounds/OnStackNew.wav
similarity index 100%
rename from Mage.Client/plugins/sounds/OnStackNew.wav
rename to Mage.Client/release/sounds/OnStackNew.wav
diff --git a/Mage.Client/plugins/sounds/OnSummon-.wav b/Mage.Client/release/sounds/OnSummon-.wav
similarity index 100%
rename from Mage.Client/plugins/sounds/OnSummon-.wav
rename to Mage.Client/release/sounds/OnSummon-.wav
diff --git a/Mage.Client/plugins/sounds/OnSummon.wav b/Mage.Client/release/sounds/OnSummon.wav
similarity index 100%
rename from Mage.Client/plugins/sounds/OnSummon.wav
rename to Mage.Client/release/sounds/OnSummon.wav
diff --git a/Mage.Client/plugins/sounds/OnTapPermanent.wav b/Mage.Client/release/sounds/OnTapPermanent.wav
similarity index 100%
rename from Mage.Client/plugins/sounds/OnTapPermanent.wav
rename to Mage.Client/release/sounds/OnTapPermanent.wav
diff --git a/Mage.Client/src/main/assembly/distribution.xml b/Mage.Client/src/main/assembly/distribution.xml
index 5d8af4f942..11f81a8589 100644
--- a/Mage.Client/src/main/assembly/distribution.xml
+++ b/Mage.Client/src/main/assembly/distribution.xml
@@ -18,21 +18,19 @@
             <outputDirectory>/lib/</outputDirectory>
             <excludes>
                 <exclude>org.mage:mage-client</exclude>
-                <exclude>org.mage:mage-theme-plugin</exclude>
                 <exclude>org.mage:mage-counter-plugin</exclude>
             </excludes>
         </dependencySet>
         <dependencySet>
             <outputDirectory>/plugins</outputDirectory>
             <includes>
-                <include>org.mage:mage-theme-plugin</include>
                 <include>org.mage:mage-counter-plugin</include>
             </includes>
         </dependencySet>
     </dependencySets>
     <fileSets>
         <fileSet>
-            <filtered>true</filtered>
+            <filtered>false</filtered>
             <directory>release/</directory>
             <outputDirectory>/</outputDirectory>
         </fileSet>
@@ -44,13 +42,6 @@
             </includes>
             <outputDirectory>/</outputDirectory>
         </fileSet>
-        <fileSet>
-            <filtered>false</filtered>
-            <directory>plugins/sounds/</directory>
-            <includes>
-                <include>*.wav</include>
-            </includes>
-            <outputDirectory>plugins/sounds/</outputDirectory>
-        </fileSet>
+
     </fileSets>
 </assembly>
diff --git a/Mage.Client/src/main/java/mage/client/constants/Constants.java b/Mage.Client/src/main/java/mage/client/constants/Constants.java
index 281f0fcaaf..cec3fef907 100644
--- a/Mage.Client/src/main/java/mage/client/constants/Constants.java
+++ b/Mage.Client/src/main/java/mage/client/constants/Constants.java
@@ -79,8 +79,8 @@ public final class Constants {
     public static final String RESOURCE_PATH_MANA_MEDIUM = IO.imageBaseDir + "symbols" + File.separator + "medium";
     public static final String RESOURCE_PATH_SET = IO.imageBaseDir + "sets" + File.separator;
     public static final String RESOURCE_PATH_SET_SMALL = RESOURCE_PATH_SET + File.separator + "small" + File.separator;
-    public static final String BASE_SOUND_PATH = "plugins" + File.separator + "sounds" + File.separator;
-    public static final String BASE_MUSICS_PATH = "plugins" + File.separator + "sounds" + File.separator + "music" + File.separator ;
+    public static final String BASE_SOUND_PATH = "sounds" + File.separator;
+    public static final String BASE_MUSICS_PATH = "music" + File.separator ;
     
     public interface IO {
         String imageBaseDir = "plugins" + File.separator + "images" + File.separator;
diff --git a/Mage.Client/src/main/java/org/mage/plugins/theme/ThemePluginImpl.java b/Mage.Client/src/main/java/org/mage/plugins/theme/ThemePluginImpl.java
index 46e8ab6763..b5e370bb18 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/theme/ThemePluginImpl.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/theme/ThemePluginImpl.java
@@ -19,14 +19,14 @@ import java.io.InputStream;
 import java.util.Map;
 
 @PluginImplementation
-@Author(name = "nantuko")
+@Author(name = "nantuko")   
+/* udpated by Noahsark */
 public class ThemePluginImpl implements ThemePlugin {
 
     private static final Logger log = Logger.getLogger(ThemePluginImpl.class);
     private static BufferedImage background;
     private List flist = new List();
-    private String BackgroundDir = "plugins" + File.separator + "plugin.data" + File.separator 
-                + "background" + File.separator;
+    private String BackgroundDir = "backgrounds" + File.separator;
     @Init
     public void init() {
     }