diff --git a/classes/ControlLibrary.php b/classes/ControlLibrary.php
index 0a0001f..4aef42c 100644
--- a/classes/ControlLibrary.php
+++ b/classes/ControlLibrary.php
@@ -141,7 +141,8 @@ public function getStandardProperties($excludeProperties = [], $addProperties =
                     'left' => Lang::get('winter.builder::lang.form.span_left'),
                     'right' => Lang::get('winter.builder::lang.form.span_right'),
                     'full' => Lang::get('winter.builder::lang.form.span_full'),
-                    'auto' => Lang::get('winter.builder::lang.form.span_auto')
+                    'auto' => Lang::get('winter.builder::lang.form.span_auto'),
+                    'storm' => Lang::get('winter.builder::lang.form.span_storm'),
                 ]
             ],
             'placeholder' => [
diff --git a/formwidgets/formbuilder/partials/_controllist.htm b/formwidgets/formbuilder/partials/_controllist.htm
index 2c0c651..d8dd248 100644
--- a/formwidgets/formbuilder/partials/_controllist.htm
+++ b/formwidgets/formbuilder/partials/_controllist.htm
@@ -2,15 +2,20 @@
     <?php
         $prevConfig = null;
         $prevSpan = null;
+        $cssClass = '';
 
         foreach ($controls as $controlName=>$controlConfig):
             $controlRenderingInfo = $this->getControlRenderingInfo($controlName, $controlConfig, $prevConfig);
 
             $prevSpan = $controlConfig['span'] = $controlRenderingInfo['span'];
             $prevConfig = $controlConfig;
+            $cssClass = (
+                    ($controlRenderingInfo['span'] == 'storm' && isset($controlRenderingInfo['properties']['cssClass'])) ?
+                    $controlRenderingInfo['properties']['cssClass'] : 'col-sx-12 col-md-6'
+            );
     ?>
         <li
-            class="control <?= e($controlRenderingInfo['spanClass']) ?>"
+            class="control <?= e($controlRenderingInfo['spanClass']) ?> <?= e($cssClass) ?>"
             data-builder-span="<?= e($controlRenderingInfo['spanFixed']) ?>"
             <?php if (!$controlRenderingInfo['unknownControl']): ?>
             data-inspectable="true"
@@ -37,4 +42,4 @@
     >
         <i class="icon-plus-circle"></i><?= e(trans('winter.builder::lang.form.click_to_add_control')) ?>
     </li><li class="clear-row"></li>
-</ul>
\ No newline at end of file
+</ul>
diff --git a/lang/en/lang.php b/lang/en/lang.php
index 239792f..a753fea 100644
--- a/lang/en/lang.php
+++ b/lang/en/lang.php
@@ -382,6 +382,7 @@
         'span_right' => 'Right',
         'span_full' => 'Full',
         'span_auto' => 'Auto',
+        'span_storm' => 'Storm',
         'style_default' => 'Default',
         'style_collapsed' => 'Collapsed',
         'style_accordion' => 'Accordion',