diff --git a/components/01_Layouts/fan/fan.config.json b/components/01_Layouts/fan/fan.config.json
index 9e26dfe..556cbbd 100644
--- a/components/01_Layouts/fan/fan.config.json
+++ b/components/01_Layouts/fan/fan.config.json
@@ -1 +1,30 @@
-{}
\ No newline at end of file
+{
+	"title": "Fan",
+	"variants": [
+		{
+			"name": "Horizontal",
+			"context": {
+				"modifier": "--horizontal"
+			}
+		},
+		{
+			"name": "Vertical",
+			"context": {
+				"modifier": "--vertical"
+			}
+		},
+		{
+			"name": "Auto",
+			"context": {
+				"modifier": "--auto"
+			}
+		},
+		{
+			"name": "FullWidth",
+			"context": {
+				"modifier": "--fullWidth"
+			}
+		}
+		
+	]
+}
\ No newline at end of file
diff --git a/components/01_Layouts/fan/fan.hbs b/components/01_Layouts/fan/fan.hbs
index 63fef0e..2ffeb4b 100644
--- a/components/01_Layouts/fan/fan.hbs
+++ b/components/01_Layouts/fan/fan.hbs
@@ -1,90 +1,25 @@
-<div class="RV-Fan RV-Fan--horizontal">
-	<div class="red RV-Fan__Base"></div>
-	<div class="green RV-Fan__Surface">
-		<div class="RV-Text">		<p>Et voluptas earum ut. Distinctio qui eaque quo aliquid ipsam ut. Et est sit sed odio aliquam nam. Possimus numquam officiis tenetur quibusdam sint quos sit est. Doloremque hic totam error velit hic. Dolorum labore necessitatibus cumque quisquam voluptate molestiae quae aspernatur.
-
-Quasi vitae cupiditate ducimus nihil. Repudiandae est iste aperiam mollitia et est occaecati at. Nobis ut voluptates tempora quis esse ipsam.
-
-Praesentium facere ea deserunt accusantium velit eos. Eaque non sapiente repellendus facilis omnis eligendi. Deserunt officiis consequatur nihil maiores explicabo. Perspiciatis qui quia et amet.</p></div>
-
-	</div>
-</div>
-<br><br>
-<div class="RV-Fan RV-Fan--auto">
-	<div class="red RV-Fan__Base"></div>
-	<div class="green RV-Fan__Surface">
-		<div class="RV-Text">
-			<p>Some content here</p>
-		<p>More conthent over here</p>
-		<p>Et voluptas earum ut. Distinctio qui eaque quo aliquid ipsam ut. Et est sit sed odio aliquam nam. Possimus numquam officiis tenetur quibusdam sint quos sit est. Doloremque hic totam error velit hic. Dolorum labore necessitatibus cumque quisquam voluptate molestiae quae aspernatur.
-
-Quasi vitae cupiditate ducimus nihil. Repudiandae est iste aperiam mollitia et est occaecati at. Nobis ut voluptates tempora quis esse ipsam.
-
-Praesentium facere ea deserunt accusantium velit eos. Eaque non sapiente repellendus facilis omnis eligendi. Deserunt officiis consequatur nihil maiores explicabo. Perspiciatis qui quia et amet.</p></div>
-
+<div class="RV-FlexRow__Item">
+	<div class="RV-Fan RV-Fan{{modifier}}">
+		<div class="RV-Fan__Base RV-Spacing__Inner--small">
+			<div class="RV-ContentCrop">
+				<img class="RV-Image" src="{{path '/images/landscape.jpeg'}}"/>
+			</div>
+		</div>
+		<div class="green RV-Fan__Surface RV-Spacing__Outer--small">
+			<div class="RV-Text">
+				<p>
+					Et voluptas earum ut. Distinctio qui eaque quo aliquid ipsam ut. Et est sit sed odio aliquam nam. Possimus numquam officiis tenetur quibusdam sint quos sit est. Doloremque hic totam error velit hic. Dolorum labore necessitatibus cumque quisquam voluptate molestiae quae aspernatur.
+				</p>
+				<p>
+					Quasi vitae cupiditate ducimus nihil. Repudiandae est iste aperiam mollitia et est occaecati at. Nobis ut voluptates tempora quis esse ipsam.
+				</p>
+				<p>
+					Praesentium facere ea deserunt accusantium velit eos. Eaque non sapiente repellendus facilis omnis eligendi. Deserunt officiis consequatur nihil maiores explicabo. Perspiciatis qui quia et amet.
+				</p>
+			</div>
+		</div>
 	</div>
 </div>
 
 
-<br><br>
-<div class="RV-Fan RV-Fan--fullWidth">
-	<div class="red RV-Fan__Base"></div>
-	<div class="green RV-Fan__Surface">
-		<div class="RV-Text">
-		<p>Some content here</p>
-		<p>More conthent over here</p>
-		<p>Et voluptas earum ut. Distinctio qui eaque quo aliquid ipsam ut. Et est sit sed odio aliquam nam. Possimus numquam officiis tenetur quibusdam sint quos sit est. Doloremque hic totam error velit hic. Dolorum labore necessitatibus cumque quisquam voluptate molestiae quae aspernatur.
 
-Quasi vitae cupiditate ducimus nihil. Repudiandae est iste aperiam mollitia et est occaecati at. Nobis ut voluptates tempora quis esse ipsam.
-
-Praesentium facere ea deserunt accusantium velit eos. Eaque non sapiente repellendus facilis omnis eligendi. Deserunt officiis consequatur nihil maiores explicabo. Perspiciatis qui quia et amet.</p></div>
-		
-	</div>
-</div>
-<br><br>
-<div class="RV-Fan RV-Fan--vertical">
-	<div class="red RV-Fan__Base"></div>
-	<div class="green RV-Fan__Surface">
-		<div class="RV-Text">
-		<p>Some content here</p>
-		<p>More conthent over here</p>
-		<p>Et voluptas earum ut. Distinctio qui eaque quo aliquid ipsam ut. Et est sit sed odio aliquam nam. Possimus numquam officiis tenetur quibusdam sint quos sit est. Doloremque hic totam error velit hic. Dolorum labore necessitatibus cumque quisquam voluptate molestiae quae aspernatur.
-
-Quasi vitae cupiditate ducimus nihil. Repudiandae est iste aperiam mollitia et est occaecati at. Nobis ut voluptates tempora quis esse ipsam.
-
-Praesentium facere ea deserunt accusantium velit eos. Eaque non sapiente repellendus facilis omnis eligendi. Deserunt officiis consequatur nihil maiores explicabo. Perspiciatis qui quia et amet.</p></div>
-		
-	</div>
-</div>
-
-<br><br>
-<div class="RV-Fan RV-Fan--vertical">
-	<div class="red RV-Fan__Base"></div>
-	<div class="green RV-Fan__Surface RV-Fan__Surface--fixedHeight">
-		<div class="RV-Text">
-		<p>Some content here</p>
-		<p>More conthent over here</p>
-		<p>Et voluptas earum ut. Distinctio qui eaque quo aliquid ipsam ut. Et est sit sed odio aliquam nam. Possimus numquam officiis tenetur quibusdam sint quos sit est. Doloremque hic totam error velit hic. Dolorum labore necessitatibus cumque quisquam voluptate molestiae quae aspernatur.
-
-Quasi vitae cupiditate ducimus nihil. Repudiandae est iste aperiam mollitia et est occaecati at. Nobis ut voluptates tempora quis esse ipsam.
-
-Praesentium facere ea deserunt accusantium velit eos. Eaque non sapiente repellendus facilis omnis eligendi. Deserunt officiis consequatur nihil maiores explicabo. Perspiciatis qui quia et amet.</p></div>
-		
-	</div>
-</div>
-
-<br><br>
-<div class="RV-Fan RV-Fan--horizontal">
-	<div class="red RV-Fan__Base"></div>
-	<div class="green RV-Fan__Surface RV-Fan__Surface--fixedWidth">
-		<div class="RV-Text">
-		<p>Some content here</p>
-		<p>More conthent over here</p>
-		<p>Et voluptas earum ut. Distinctio qui eaque quo aliquid ipsam ut. Et est sit sed odio aliquam nam. Possimus numquam officiis tenetur quibusdam sint quos sit est. Doloremque hic totam error velit hic. Dolorum labore necessitatibus cumque quisquam voluptate molestiae quae aspernatur.
-
-Quasi vitae cupiditate ducimus nihil. Repudiandae est iste aperiam mollitia et est occaecati at. Nobis ut voluptates tempora quis esse ipsam.
-
-Praesentium facere ea deserunt accusantium velit eos. Eaque non sapiente repellendus facilis omnis eligendi. Deserunt officiis consequatur nihil maiores explicabo. Perspiciatis qui quia et amet.</p></div>
-		
-	</div>
-</div>
\ No newline at end of file
diff --git a/components/01_Layouts/flexGrid/flexGrid.config.json b/components/01_Layouts/flexGrid/flexGrid.config.json
index 9e26dfe..6b4800d 100644
--- a/components/01_Layouts/flexGrid/flexGrid.config.json
+++ b/components/01_Layouts/flexGrid/flexGrid.config.json
@@ -1 +1,23 @@
-{}
\ No newline at end of file
+{
+	"title": "FlexGRid",
+	"variants": [
+		{
+			"name": "AutoWidth",
+			"context": {
+				"modifier": "--autoWidth"
+			}
+		},
+		{
+			"name": "FixedSize",
+			"context": {
+				"modifier": "--fixedSize"
+			}
+		},
+		{
+			"name": "Masonry",
+			"context": {
+				"modifier": "--masonry"
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/components/01_Layouts/flexGrid/flexGrid.hbs b/components/01_Layouts/flexGrid/flexGrid.hbs
index 84b376b..36a3156 100644
--- a/components/01_Layouts/flexGrid/flexGrid.hbs
+++ b/components/01_Layouts/flexGrid/flexGrid.hbs
@@ -1,48 +1,52 @@
-<div class="RV-FlexGrid RV-FlexGrid--autoWidth">
-	<div class="red RV-FlexGrid__Item">Heres</div>
-	<div class="green RV-FlexGrid__Item">some</div>
-	<div class="red RV-FlexGrid__Item">totally</div>
-	<div class="green RV-FlexGrid__Item">awesome</div>
-	<div class="red RV-FlexGrid__Item">content</div>
-	<div class="green RV-FlexGrid__Item">for</div>
-	<div class="red RV-FlexGrid__Item">you</div>
-	<div class="green RV-FlexGrid__Item">only</div>
-	<div class="red RV-FlexGrid__Item">for</div>
-	<div class="green RV-FlexGrid__Item">you</div>
-	<div class="red RV-FlexGrid__Item">to</div>
-	<div class="green RV-FlexGrid__Item">enjoy</div>
-</div>
-
-<br><br>
-
-<div class="RV-FlexGrid RV-FlexGrid--fixedSize">
-	<div class="red RV-FlexGrid__Item">Heres</div>
-	<div class="green RV-FlexGrid__Item">some</div>
-	<div class="red RV-FlexGrid__Item">totally</div>
-	<div class="green RV-FlexGrid__Item">awesome</div>
-	<div class="red RV-FlexGrid__Item">content</div>
-	<div class="green RV-FlexGrid__Item">for</div>
-	<div class="red RV-FlexGrid__Item">you</div>
-	<div class="green RV-FlexGrid__Item">only</div>
-	<div class="red RV-FlexGrid__Item">for</div>
-	<div class="green RV-FlexGrid__Item">you</div>
-	<div class="red RV-FlexGrid__Item">to</div>
-	<div class="green RV-FlexGrid__Item">enjoy</div>
-</div>
-
-<br><br>
-
-<div class="RV-FlexGrid RV-FlexGrid--masonry">
-	<div class="red RV-FlexGrid__Item">Heres</div>
-	<div class="green RV-FlexGrid__Item">some</div>
-	<div class="red RV-FlexGrid__Item RV-FlexGrid__Item--right">totally (right)</div>
-	<div class="green RV-FlexGrid__Item RV-FlexGrid__Item--center">awesome</div>
-	<div class="red RV-FlexGrid__Item">content</div>
-	<div class="green RV-FlexGrid__Item">for</div>
-	<div class="red RV-FlexGrid__Item">you <br>(im sneaking in some height)</div>
-	<div class="green RV-FlexGrid__Item">only</div>
-	<div class="red RV-FlexGrid__Item RV-FlexGrid__Item--fixedSize">fixed for</div>
-	<div class="green RV-FlexGrid__Item">you</div>
-	<div class="red RV-FlexGrid__Item">to</div>
-	<div class="green RV-FlexGrid__Item">enjoy</div>
+<div class="RV-FlexGrid RV-FlexGrid{{modifier}} RV-Spacing__Inner--medium">
+	<div class="RV-FlexGrid__Item RV-BoxShadow RV-BoxShadow--simple RV-Spacing__Inner--medium">
+		<div class="RV-ContentCrop">
+			<img class="RV-Image" src="{{path '/images/square.jpeg'}}"/>
+		</div>
+	</div>
+	<div class="RV-FlexGrid__Item RV-BoxShadow RV-BoxShadow--simple RV-Spacing__Inner--medium">
+		<div class="RV-ContentCrop">
+			<img class="RV-Image" src="{{path '/images/portrait.jpeg'}}"/>
+		</div>
+	</div>
+	<div class="RV-FlexGrid__Item RV-BoxShadow RV-BoxShadow--simple RV-Spacing__Inner--medium">
+		<div class="RV-ContentCrop">
+			<img class="RV-Image" src="{{path '/images/portrait.jpeg'}}"/>
+		</div>
+	</div>
+	<div class="RV-FlexGrid__Item RV-BoxShadow RV-BoxShadow--simple RV-Spacing__Inner--medium">
+		<div class="RV-ContentCrop">
+			<img class="RV-Image" src="{{path '/images/landscape.jpeg'}}"/>
+		</div>
+	</div>
+	<div class="RV-FlexGrid__Item RV-BoxShadow RV-BoxShadow--simple RV-Spacing__Inner--medium">
+		<div class="RV-ContentCrop">
+			<img class="RV-Image" src="{{path '/images/square.jpeg'}}"/>
+		</div>
+	</div>
+	<div class="RV-FlexGrid__Item RV-BoxShadow RV-BoxShadow--simple RV-Spacing__Inner--medium">
+		<div class="RV-ContentCrop">
+			<img class="RV-Image" src="{{path '/images/landscape.jpeg'}}"/>
+		</div>
+	</div>
+	<div class="RV-FlexGrid__Item RV-BoxShadow RV-BoxShadow--simple RV-Spacing__Inner--medium">
+		<div class="RV-ContentCrop">
+			<img class="RV-Image" src="{{path '/images/landscape.jpeg'}}"/>
+		</div>
+	</div>
+	<div class="RV-FlexGrid__Item RV-BoxShadow RV-BoxShadow--simple RV-Spacing__Inner--medium">
+		<div class="RV-ContentCrop">
+			<img class="RV-Image" src="{{path '/images/portrait.jpeg'}}"/>
+		</div>
+	</div>
+	<div class="RV-FlexGrid__Item RV-BoxShadow RV-BoxShadow--simple RV-Spacing__Inner--medium">
+		<div class="RV-ContentCrop">
+			<img class="RV-Image" src="{{path '/images/square.jpeg'}}"/>
+		</div>
+	</div>
+	<div class="RV-FlexGrid__Item RV-BoxShadow RV-BoxShadow--simple RV-Spacing__Inner--medium">
+		<div class="RV-ContentCrop">
+			<img class="RV-Image" src="{{path '/images/portrait.jpeg'}}"/>
+		</div>
+	</div>									
 </div>
\ No newline at end of file