diff --git a/src/definitions/modules/embed.js b/src/definitions/modules/embed.js
index 6e504f7a8..9c55e0709 100644
--- a/src/definitions/modules/embed.js
+++ b/src/definitions/modules/embed.js
@@ -207,7 +207,10 @@ $.fn.embed = function(parameters) {
           },
           type: function() {
             var source = module.get.source();
-            return sources[source].type;
+            return (sources[source] !== undefined)
+              ? sources[source].type
+              : false
+            ;
           },
           url: function() {
             return (settings.url)
@@ -225,19 +228,21 @@ $.fn.embed = function(parameters) {
               matchedSource = false
             ;
             url = url || module.get.url();
-            $.each(sources, function(name, source) {
-              if(url.search(source.domain) !== -1) {
-                matchedSource = name;
-                return false;
-              }
-            });
+            if(url) {
+              $.each(sources, function(name, source) {
+                if(url.search(source.domain) !== -1) {
+                  matchedSource = name;
+                  return false;
+                }
+              });
+            }
             return matchedSource;
           },
           icon: function() {
             var
               source = module.get.source()
             ;
-            return (sources[source].icon !== undefined)
+            return (sources[source] !== undefined)
               ? sources[source].icon
               : false
             ;
@@ -248,7 +253,7 @@ $.fn.embed = function(parameters) {
               source = settings.source || $module.data(metadata.source),
               url
             ;
-            url = (sources[source].url !== undefined)
+            url = (sources[source] !== undefined)
               ? sources[source].url.replace('{id}', id)
               : false
             ;
@@ -302,7 +307,7 @@ $.fn.embed = function(parameters) {
               html       = templates.iframe(url, parameters);
             }
             else {
-              module.error(error.noURL);
+              module.error(error.noURL, $module);
             }
             return html;
           },
diff --git a/src/definitions/modules/embed.less b/src/definitions/modules/embed.less
index 321df69db..a046887ce 100644
--- a/src/definitions/modules/embed.less
+++ b/src/definitions/modules/embed.less
@@ -99,7 +99,6 @@
   z-index: @iconZIndex;
 }
 
-
 /*******************************
             States
 *******************************/
@@ -127,4 +126,25 @@
   display: block;
 }
 
-.loadUIOverrides();
\ No newline at end of file
+.loadUIOverrides();
+
+
+/*******************************
+          Variations
+*******************************/
+
+.ui.square.embed {
+  padding-bottom: @squareRatio;
+}
+.ui[class*="4:3"].embed {
+  padding-bottom: @standardRatio;
+}
+.ui[class*="16:9"].embed {
+  padding-bottom: @widescreenRatio;
+}
+.ui[class*="21:9"].embed {
+  padding-bottom: @ultraWidescreenRatio;
+}
+
+
+
diff --git a/src/themes/default/modules/embed.variables b/src/themes/default/modules/embed.variables
index 05c3cd1b6..b4f14a079 100644
--- a/src/themes/default/modules/embed.variables
+++ b/src/themes/default/modules/embed.variables
@@ -8,8 +8,6 @@
 
 /* Simple */
 @background: @lightGrey;
-@widescreenRatio: (9/16) * 100%;
-@standardRatio: (3/4) * 100%;
 
 /* Placeholder */
 @placeholderBackground: @background;
@@ -27,4 +25,15 @@
 
 /* Video */
 @hoverIconBackground: rgba(0, 0, 0, 0);
-@hoverIconColor: @white;
\ No newline at end of file
+@hoverIconColor: @white;
+
+
+/*-------------------
+      Variations
+--------------------*/
+
+/* Aspect Ratios */
+@squareRatio: (1/1) * 100%;
+@widescreenRatio: (9/16) * 100%;
+@ultraWidescreenRatio: (9/21) * 100%;
+@standardRatio: (3/4) * 100%;
\ No newline at end of file