diff --git a/modules/library/dnd/js/dnd-library.js b/modules/library/dnd/js/dnd-library.js
index c81d23c..ddbdcf5 100644
--- a/modules/library/dnd/js/dnd-library.js
+++ b/modules/library/dnd/js/dnd-library.js
@@ -134,7 +134,7 @@ $.extend($.expr[":"], {
  */
 Drupal.theme.prototype.scaldEmbed = function(atom, context) {
   context = context ? context : Drupal.settings.dnd.contextDefault;
-  var output = '<div class="dnd-atom-wrapper"><div class="dnd-drop-wrapper">' + atom.contexts[context] + '</div>';
+  var output = '<div class="dnd-atom-wrapper' + (atom.meta.align && atom.meta.align != 'none' ? ' atom-align-' + atom.meta.align : '') + '"><div class="dnd-drop-wrapper">' + atom.contexts[context] + '</div>';
   if (atom.meta.legend) {
     output += '<div class="dnd-legend-wrapper">' + atom.meta.legend + '</div>';
   }
diff --git a/modules/library/dnd/plugins/ckeditor/dialogs/dnd.js b/modules/library/dnd/plugins/ckeditor/dialogs/dnd.js
index 8c891e7..8970d21 100644
--- a/modules/library/dnd/plugins/ckeditor/dialogs/dnd.js
+++ b/modules/library/dnd/plugins/ckeditor/dialogs/dnd.js
@@ -21,7 +21,8 @@ CKEDITOR.dialog.add('atomProperties', function(editor) {
         }
         return;
       }
-      var data, legend;
+      var elm, data, legend;
+      elm = $(Drupal.dnd.atomCurrent.$);
       // Get the data directly from the comment markup.
       data = Drupal.dnd.atomCurrent.getChild(0).getHtml().replace(/<!--\{cke_protected\}\{C\}([\s\S]+?)-->.*/, function(match, data) {
         return decodeURIComponent(data);
@@ -34,12 +35,14 @@ CKEDITOR.dialog.add('atomProperties', function(editor) {
       atom = {
         sid: data.match(/scald=(\d+)/)[1],
         context: data.match(/\:(\S+)/)[1],
-        legend: legend
+        legend: legend,
+        align: elm.hasClass('atom-align-left') ? 'left' : elm.hasClass('atom-align-right') ? 'right' : elm.hasClass('atom-align-center') ? 'center' : 'none'
       };
       this.setupContent(atom);
     },
     onOk: function() {
       Drupal.dnd.Atoms[atom.sid].meta.legend = this.getValueOf('info', 'txtLegend');
+      Drupal.dnd.Atoms[atom.sid].meta.align = this.getValueOf('info', 'cmbAlign');
       var context = this.getValueOf('info', 'cmbContext');
       Drupal.dnd.fetchAtom(context, atom.sid, function() {
         var html = Drupal.theme('scaldEmbed', Drupal.dnd.Atoms[atom.sid], context);
@@ -72,6 +75,15 @@ CKEDITOR.dialog.add('atomProperties', function(editor) {
             setup: function(atom) {
               this.setValue(atom.context);
             }
+          },
+          {
+            id: 'cmbAlign',
+            type: 'select',
+            label: 'Alignment',
+            items: [['None', 'none'], ['Left', 'left'], ['Right', 'right'], ['Center', 'center']],
+            setup: function(atom) {
+              this.setValue(atom.align);
+            }
           }
         ]
       }
@@ -79,3 +91,4 @@ CKEDITOR.dialog.add('atomProperties', function(editor) {
   };
 });
 })(jQuery);
+