diff --git a/Configuration/TypoScript/Settings/constants.txt b/Configuration/TypoScript/Settings/constants.txt
index dd89e70..ddd107b 100755
--- a/Configuration/TypoScript/Settings/constants.txt
+++ b/Configuration/TypoScript/Settings/constants.txt
@@ -16,6 +16,11 @@ plugin.tx_fluidbootstraptheme.settings {
 	# cat=FLUIDBOOTSTRAPTHEME/settings; type=int+; label=Width of sidebar (what remains of a 12-column total is used by main content)
 	distribution = 4
 	# cat=FLUIDBOOTSTRAPTHEME/settings; type=int+; label=Number of grid columns: Set this to the same number used in your custom Bootstrap CSS if you've switched from the default 12-grid
-    gridColumns = 12
+	gridColumns = 12
 
 }
+
+plugin.tx_fluidbootstraptheme.settings {
+	# cat=FLUIDBOOTSTRAPTHEME CSS/settings; type=string; label = CSS wrapper Classes for Grid Container (comma separated list)
+	colwrap = first, second, third
+}
\ No newline at end of file
diff --git a/Configuration/TypoScript/setup.txt b/Configuration/TypoScript/setup.txt
index 75215e2..a209ae6 100755
--- a/Configuration/TypoScript/setup.txt
+++ b/Configuration/TypoScript/setup.txt
@@ -11,6 +11,7 @@ plugin.tx_fluidbootstraptheme.view {
 
 plugin.tx_fluidbootstraptheme.settings {
 	gridColumns = {$plugin.tx_fluidbootstraptheme.settings.gridColumns}
+	colwrap = {$plugin.tx_fluidbootstraptheme.settings.colwrap}
 	menu {
 		main.entryLevel = 0
 		sub.entryLevel = 1
diff --git a/Resources/Private/Templates/Content/FourColumn.html b/Resources/Private/Templates/Content/FourColumn.html
index 04b72c3..f053820 100644
--- a/Resources/Private/Templates/Content/FourColumn.html
+++ b/Resources/Private/Templates/Content/FourColumn.html
@@ -32,6 +32,9 @@ <h3>
 				</flux:grid>
 			</flux:form.sheet>
 			<flux:form.sheet name="additionalCSS">
+				<v:variable.set name="settings.wrapdropdown"
+								value="{v:variable.typoscript(path: 'plugin.tx_fluidbootstraptheme.settings.colwrap')}" />
+				<flux:field.select name="settings.grid4.wrapclass" items="none,{settings.wrapdropdown}" label="Choose a Wrap Class" default="none" />
 				<flux:field.input name="settings.grid4.rowCSS" size="10" />
 				<flux:field.input name="settings.grid4.col1CSS" size="10" />
 				<flux:field.checkbox name="settings.grid4.col1hide" default="0" />
@@ -65,7 +68,7 @@ <h3>
 	</f:section>
 
 	<f:section name="FrontendColRenderingGrid4">
-		<div class="row {settings.grid4.rowCSS}">
+		<div class="row {settings.grid4.rowCSS} {f:if(condition: "{0: settings.grid4.wrapclass} == {0 : 'none'}", else: '{settings.grid4.wrapclass}')} ">
 			<f:if condition="{settings.grid4.split}=='more'">
 				<f:then>
 					<div class="{settings.grid4.col1width} {settings.grid4.col1CSS} {f:if(condition: settings.grid4.eqh, then: 'equal-height')} {f:if(condition: settings.grid4.col1hide, then: 'hidden-xs')}">
diff --git a/Resources/Private/Templates/Content/ThreeColumn.html b/Resources/Private/Templates/Content/ThreeColumn.html
index 2c95c57..a1522ac 100644
--- a/Resources/Private/Templates/Content/ThreeColumn.html
+++ b/Resources/Private/Templates/Content/ThreeColumn.html
@@ -35,6 +35,9 @@ <h3>
 				</f:if>
 			</flux:form.sheet>
 			<flux:form.sheet name="additionalCSS">
+				<v:variable.set name="settings.wrapdropdown"
+								value="{v:variable.typoscript(path: 'plugin.tx_fluidbootstraptheme.settings.colwrap')}" />
+				<flux:field.select name="settings.grid3.wrapclass" items="none,{settings.wrapdropdown}" label="Choose a Wrap Class" default="none" />
 				<flux:field.input name="settings.grid3.rowCSS" size="10"/>
 				<flux:field.input name="settings.grid3.col1CSS" size="10"/>
 				<flux:field.checkbox name="settings.grid3.col1hide" default="0"/>
@@ -84,7 +87,7 @@ <h3>
 	</f:section>
 
 	<f:section name="FrontendColRenderingGrid3">
-		<div class="row {settings.grid3.rowCSS} ">
+		<div class="row {settings.grid3.rowCSS} {f:if(condition: "{0: settings.grid3.wrapclass} == {0 : 'none'}", else: '{settings.grid4.wrapclass}')} ">
 			<f:if condition="{settings.grid3.split}=='more'">
 				<f:then>
 					<f:render section="FEMoreGrid3" arguments="{_all}"/>
diff --git a/Resources/Private/Templates/Content/TwoColumn.html b/Resources/Private/Templates/Content/TwoColumn.html
index 5767d1d..f5bea79 100644
--- a/Resources/Private/Templates/Content/TwoColumn.html
+++ b/Resources/Private/Templates/Content/TwoColumn.html
@@ -34,6 +34,9 @@ <h3>
 				</f:if>
 			</flux:form.sheet>
 			<flux:form.sheet name="additionalCSS">
+				<v:variable.set name="settings.wrapdropdown"
+								value="{v:variable.typoscript(path: 'plugin.tx_fluidbootstraptheme.settings.colwrap')}" />
+				<flux:field.select name="settings.grid2.wrapclass" items="none,{settings.wrapdropdown}" label="Choose a Wrap Class" default="none" />
 				<flux:field.input name="settings.grid2.rowCSS" size="10" />
 				<flux:field.input name="settings.grid2.col1CSS" size="10" />
 				<flux:field.checkbox name="settings.grid2.col1hide" default="0" />
@@ -61,7 +64,7 @@ <h3>
 	</f:section>
 
 	<f:section name="FrontendColRenderingGrid2">
-		<div class="row {settings.grid2.rowCSS}">
+		<div class="row {settings.grid2.rowCSS} {f:if(condition: "{0: settings.grid2.wrapclass} == {0 : 'none'}", else: '{settings.grid4.wrapclass}')} ">
 			<f:if condition="{settings.grid2.split}=='more'">
 				<f:then>