diff --git a/app_sources/Artwork/service.js b/app_sources/Artwork/service.js
index 31a542a..3fb30e7 100644
--- a/app_sources/Artwork/service.js
+++ b/app_sources/Artwork/service.js
@@ -33,8 +33,9 @@ app.factory('artworks', ['$q', 'qbind', 'fs',
         filename: null,
       };
 
-      // Extract type from extname
+      // Extract type from extname & filename
       obj.type = fs.extname(obj.src || '');
+      obj.filename = fs.basename(obj.src);
 
       // Natural size method differ base on the type
       var getSize = $q.when(null);
@@ -47,18 +48,29 @@ app.factory('artworks', ['$q', 'qbind', 'fs',
       } else if (obj.type === 'mp4') {
         getSize = getVideoNaturalSize(obj.src);
       }
-
       getSize.then(function(size) {
         obj.size = size;
-      });
 
-      obj.computeBox = service.computeBox.bind(null, obj);
+        if(obj.type =='swf'){
+            var swfOptions = {
+            bgcolor: "transparent",
+            tagId: obj.filename.toLowerCase(),
+            optionHeight: obj.size.height,
+            optionWidth:obj.size.width
+        };
+        swf2js.load(
+            obj.src,
+            swfOptions);
+        };
+        obj.computeBox = service.computeBox.bind(null, obj);
+      });
 
       return obj;
     };
 
     // Compute item bounding box base one config
     service.computeBox = function(obj, conf, isOverlay) {
+
       // If we miss both config or size, abort
       if (!conf && !obj.size)
         return {};
@@ -71,12 +83,17 @@ app.factory('artworks', ['$q', 'qbind', 'fs',
       box.width  = (conf.w || obj.size.width || 0);
       box.height = (conf.h || obj.size.height || 0);
 
-      // Position (x,y) is defined as the position of the center
+        // Position (x,y) is defined as the position of the center
       // of the resized artwork relative to window (top,left)
       // posX = x - (width / 2)
       box.left = (conf.x - (box.width / 2)) || 0;
       box.top = (conf.y - (box.height / 2)) || 0;
 
+      //SWF placement... please don't ask
+      if((obj.type == 'swf') && (conf.x <= 0)){
+        box.left = box.top = 0;
+      }
+
       // If the item is an overlay, the previously parsed config
       // is its artorwk's and the actual size and position can be
       // deduced from it.
diff --git a/app_sources/Artwork/template.html b/app_sources/Artwork/template.html
index b531167..a6a021e 100644
--- a/app_sources/Artwork/template.html
+++ b/app_sources/Artwork/template.html
@@ -1,12 +1,6 @@
 <div ng-cloak class="Artwork" ng-style="style">
   <img ng-if="artwork.type=='png'" class="Artwork-item" ng-src="{{src}}" />
 
-  <object ng-if="artwork.type=='swf'" class="Artwork-item" embed-src="{{src}}" type="application/x-shockwave-flash" >
-    <param name="autoplay" value="true">
-    <param name="wmode" value="transparent">
-    <param name="scale" value="exactfit">
-  </object>
-
   <jplayer ng-if="artwork.type=='mp4' || artwork.type=='flv'" class="Artwork-item" src="{{src}}" autoplay="true" loop="true" id="artworkvideo">
   </jplayer>
 </div>
diff --git a/app_sources/Theme/service.js b/app_sources/Theme/service.js
index 80a3f50..5c69cf2 100644
--- a/app_sources/Theme/service.js
+++ b/app_sources/Theme/service.js
@@ -28,6 +28,7 @@ app.factory('themes', ['$q', 'fs', 'settings', 'zip', 'xml', 'dataServer',
         background: null,
         html: false,
         video: null,
+        script: null
       };
 
       // Check if this is a Html theme
diff --git a/app_sources/Theme/template.html b/app_sources/Theme/template.html
index 7efcc0a..4f656f8 100644
--- a/app_sources/Theme/template.html
+++ b/app_sources/Theme/template.html
@@ -3,7 +3,7 @@
   <div class="no-click"></div>
 </div>
 
-<div class="Theme HSpin" ng-if="!theme.html">
+<div class="Theme HSpin" ng-if="!theme.html" id="theme">
   <!-- <pre ng-bind="theme|json"></pre> -->
   <!-- <pre ng-bind="artworks|json"></pre> -->
 
diff --git a/bower.json b/bower.json
index 18451ac..d3709d5 100644
--- a/bower.json
+++ b/bower.json
@@ -33,7 +33,8 @@
     "angular-piwik": "ThoughtWorksInc/angular-piwik#duplicate-calls",
     "jplayer": "~2.9.2",
     "angular-translate-loader-static-files": "~2.7.2",
-    "angular-translate": "~2.7.2"
+    "angular-translate": "~2.7.2",
+    "swf2js": "https://github.com/ienaga/swf2js.git"
   },
   "resolutions": {
     "angular": "1.3.11"
diff --git a/gulpfile.js b/gulpfile.js
index 26c3b41..caac2c2 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -103,6 +103,7 @@ var vendors = {
     'bower_components/json-formatter/dist/json-formatter.js',
     'bower_components/angular-toastr/dist/angular-toastr.tpls.js',
     'bower_components/jplayer/dist/jplayer/jquery.jplayer.js',
+    'bower_components/swf2js/swf2js.js',
   ],
   'styles': [
     'bower_components/skeleton/css/normalize.css',