Adapting to new bem generator

components/02_ContentShape/shape/_shape.styl

@@ -9,7 +9,7 @@
  * You may want to combine this mixin with RV-FocalPoint.
  */
 RV-Shape--square()
-	+RV-Block__Modifier--name('square')
+	+RV-Block--modifier()
 		padding-top 100%
 		width 100%
 		position relative
@@ -22,7 +22,7 @@ RV-Shape--square()
 			right 0
 
 RV-Shape--circle()
-	+RV-Block__Modifier--name('circle')	
+	+RV-Block--modifier()
 		padding-top 100%
 		width 100%
 		position relative
@@ -38,8 +38,5 @@ RV-Shape--circle()
 			right 0
 
 +RV-Block('RV-Shape')
-	+RV-Block__Modifier()
+	RV-Shape--square()
-		RV-Shape--square()
+	RV-Shape--circle()
-		
-	+RV-Block__Modifier()
-		RV-Shape--circle()

components/02_ContentShape/truncation/_truncation.styl

@@ -4,7 +4,7 @@
  * and container height manualy in Stylues. CSS-Variables can unfortunately not be used in this case.
  */
 RV-Truncation--fade(background-color=white)
-	+RV-Block__Modifier--name('fade')
+	+RV-Block--modifier()
 		
 		+RV-Element('Content')
 			&:last-child:after
@@ -20,7 +20,7 @@ RV-Truncation--fade(background-color=white)
 				z-index 10
 
 RV-Truncation--ellipsis(background-color=white)
-	+RV-Block__Modifier--name('ellipsis')
+	+RV-Block--modifier()
 		
 		+RV-Element('Cutter')
 			&:after
@@ -74,8 +74,5 @@ RV-Truncation(line-height=1.3em, height=100%, background-color=white)
 +RV-Block('RV-Truncation')
 	RV-Truncation()
 	
-	+RV-Block__Modifier()
+	RV-Truncation--fade(--background-color)
-		RV-Truncation--fade(--background-color)
+	RV-Truncation--ellipsis(--background-color)
-	
-	+RV-Block__Modifier()
-		RV-Truncation--ellipsis(--background-color)