diff --git a/component-icons_vgen.go b/component-icons_vgen.go
index 24e550c..c1df593 100644
--- a/component-icons_vgen.go
+++ b/component-icons_vgen.go
@@ -33,7 +33,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0xA4A99DEB8ABC6467^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x7CD5554FF912320^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LArrowDown)
 			if vgcomp == nil {
@@ -49,7 +49,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x3E98B0432F16B356^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x35B8BF55C055ABBB^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LArrowLeft)
 			if vgcomp == nil {
@@ -65,7 +65,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0xD330161D7FCFBAEC^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0xA313BA694C3D6030^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LArrowRight)
 			if vgcomp == nil {
@@ -81,7 +81,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x8FD8B69C04771C5E^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0xA7B0823D84E29D16^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LArrowUp)
 			if vgcomp == nil {
@@ -97,7 +97,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0xED3F7B9C79EAFCBE^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x99644BAFFC1834E5^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LBackToWindow)
 			if vgcomp == nil {
@@ -113,7 +113,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0xC5E74B82974D997A^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x82CD037474F0157C^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LCancel)
 			if vgcomp == nil {
@@ -129,7 +129,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0xB01D24FC1AB43566^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x63D0594286CCD28F^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LChevronDown)
 			if vgcomp == nil {
@@ -145,7 +145,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x16BE0776F608B6FC^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x3C511A8720518F9A^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LChevronLeft)
 			if vgcomp == nil {
@@ -161,7 +161,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0xFFA4289EE084B4BD^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0xDE3D93DFDE08B7ED^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LChevronRight)
 			if vgcomp == nil {
@@ -177,7 +177,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0xB881C0A224F6C6B2^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0xE45FDAE28162B7EB^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LChevronUp)
 			if vgcomp == nil {
@@ -193,7 +193,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0xA4DD444EB318D2F6^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0xC2A73D3A6563883E^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LCircleMinus)
 			if vgcomp == nil {
@@ -209,7 +209,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x90E48245CDE95F21^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0xD5477EA24E8A3788^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LCirclePlus)
 			if vgcomp == nil {
@@ -225,7 +225,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x265CAA088AF7ECE2^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0xE77F4FA12A5A5F19^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LCopy)
 			if vgcomp == nil {
@@ -241,7 +241,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x84AC700125A9A125^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0xF15E528D38953040^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LCustomize)
 			if vgcomp == nil {
@@ -257,7 +257,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0xD020D9D63A4A1D44^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x211F725AA3D776^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LCut)
 			if vgcomp == nil {
@@ -273,7 +273,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x6FC5BA8D9571E7C1^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0xC4A176F411B46F3C^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LDelete)
 			if vgcomp == nil {
@@ -289,7 +289,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x20CC48C4ADB1FAA0^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x6C1134729714301^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LDeliver)
 			if vgcomp == nil {
@@ -305,7 +305,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0xA1963C12F02CBA73^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0xD76EDA9DB9CFED23^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LDocument)
 			if vgcomp == nil {
@@ -321,7 +321,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0xDDB463F144A8CFA0^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x829240163289F70D^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LDocumentBulletList)
 			if vgcomp == nil {
@@ -337,7 +337,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x99E081C9F76AC20F^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x437F3A7B0A9485B5^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LDocumentCheckboxes)
 			if vgcomp == nil {
@@ -353,7 +353,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x3B0C424AD733AB5^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0xD3C1CCAF0BD23E33^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LDocumentRichText)
 			if vgcomp == nil {
@@ -369,7 +369,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x412CA57BAB7FDDF3^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0xC31F07A7E7F5C3F9^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LDocumentText)
 			if vgcomp == nil {
@@ -385,7 +385,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x5F0E78C71661D985^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0xFD4B2ED5EC8D6E83^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LDownload)
 			if vgcomp == nil {
@@ -401,7 +401,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0xF0EA6E227C4ABBBF^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x5B2E5731378424D9^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LEdit)
 			if vgcomp == nil {
@@ -417,7 +417,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0xDDE532231238D6A1^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0xAEC97CCA0532C416^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LErrorCircle)
 			if vgcomp == nil {
@@ -433,7 +433,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x2C7326B378100002^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x78ADD1251B1042A^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LFilter)
 			if vgcomp == nil {
@@ -449,7 +449,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0xACC51CF188BD4E8B^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x28593D2849D26525^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LFullScreen)
 			if vgcomp == nil {
@@ -465,7 +465,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x9DCF1D62D9CE7862^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0xD52500FAA3E5A3A5^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LGlobalNav)
 			if vgcomp == nil {
@@ -481,7 +481,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x26FE5BEF48EE857B^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x9D7B50EB28C82BD8^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LGlobe)
 			if vgcomp == nil {
@@ -497,7 +497,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0xE00757F8121F0B9D^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x81024BCDD82317ED^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LHome)
 			if vgcomp == nil {
@@ -513,7 +513,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x3348C39F38C0DD00^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x90E750CEA8F69814^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LHourglass)
 			if vgcomp == nil {
@@ -529,7 +529,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x9BF468CDD4C0EE57^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x5A27F1A1FD80C79F^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LInfoCircle)
 			if vgcomp == nil {
@@ -545,7 +545,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0xA0A0C35F560CA5B8^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0xE0F8BEF66A863B91^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LLockClosed)
 			if vgcomp == nil {
@@ -561,7 +561,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x4D1DEDEE72261588^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x507D055D01E8FE80^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LLockDisabled)
 			if vgcomp == nil {
@@ -577,7 +577,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x69D94D03D081079C^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0xFD96828BD86C8587^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LLockOpened)
 			if vgcomp == nil {
@@ -593,7 +593,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0xEE57B69201DDB75F^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x8658DFCFF5C70BEB^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LMail)
 			if vgcomp == nil {
@@ -609,7 +609,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0xF34049E40EE6A9F6^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x323100DAB880412B^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LMailOpened)
 			if vgcomp == nil {
@@ -625,7 +625,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x92C14EA8EECF16A6^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0xF86DFE79E0BBCF29^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LMinus)
 			if vgcomp == nil {
@@ -641,7 +641,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0xC4F3641D7C418B51^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x98E10C3A089CA80^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LMore)
 			if vgcomp == nil {
@@ -657,7 +657,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0xE6F9DFFD10B1DDF6^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x77730BB83F841C02^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LPaste)
 			if vgcomp == nil {
@@ -673,7 +673,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0xE56B59CF51A1C77B^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0xF2A0A560EBD2E658^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LPause)
 			if vgcomp == nil {
@@ -689,7 +689,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x5B4AE06896563BFB^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x4DF6F06D133123ED^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LPlus)
 			if vgcomp == nil {
@@ -705,7 +705,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x88EA916C13E361AA^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0xF8FEC532E081845A^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LPowerButton)
 			if vgcomp == nil {
@@ -721,7 +721,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x2B8CFD406F91944C^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0xDAF05946906C3B76^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LRedo)
 			if vgcomp == nil {
@@ -737,7 +737,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x560AC5FCAB4ACB70^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x93388923E6AEF963^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LReload)
 			if vgcomp == nil {
@@ -753,7 +753,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x566C64872BC080B9^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x1248B1ACDE98043E^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LSave)
 			if vgcomp == nil {
@@ -769,7 +769,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x12C0A5D580DF7B29^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x6221E1041FD3DEFF^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LSearch)
 			if vgcomp == nil {
@@ -785,7 +785,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0xC6986698E5082964^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0xFDA1845851235029^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LSettings)
 			if vgcomp == nil {
@@ -801,7 +801,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x27DD2531D73BC51^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x4246902691E421A0^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LSort)
 			if vgcomp == nil {
@@ -817,7 +817,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0xBB3723095FCCAC34^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0xC5AE954009100B61^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LStar)
 			if vgcomp == nil {
@@ -833,7 +833,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x54CA39A2AF8684AD^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x2B99232580D74D0E^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LStart)
 			if vgcomp == nil {
@@ -849,7 +849,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x2AEC982C5FA13775^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x7D2AC6F219EDD28E^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LStop)
 			if vgcomp == nil {
@@ -865,7 +865,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x68D6FE586FEA1150^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x4F2FADAC2213425D^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LStopWatch)
 			if vgcomp == nil {
@@ -881,7 +881,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x1DED8FE0AAA1C92F^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x4A615C414AB6B204^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LUndo)
 			if vgcomp == nil {
@@ -897,7 +897,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x15D6596E05B4671A^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x5103F17DC0D86135^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LUpload)
 			if vgcomp == nil {
@@ -913,7 +913,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x7BB834E1D2946D07^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0xD377989EA87C0643^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LWarehouse)
 			if vgcomp == nil {
@@ -929,7 +929,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0xBF5DD2C4AC53C0B3^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0xDE2B7086FC7243CC^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LWarning)
 			if vgcomp == nil {
@@ -945,7 +945,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x99CEB6B59A82F699^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x875132A7ECD124C^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LZoom)
 			if vgcomp == nil {
@@ -961,7 +961,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x4F648DAD858C0E8A^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x76468F7456B41901^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LZoomIn)
 			if vgcomp == nil {
@@ -977,7 +977,7 @@ func (c *ComponentIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0xD93ACD076218E08^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x1DC81B5C2C26E33^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LZoomOut)
 			if vgcomp == nil {
diff --git a/components/input/button.vugu b/components/input/button.vugu
index 9bcbd53..631082c 100644
--- a/components/input/button.vugu
+++ b/components/input/button.vugu
@@ -11,8 +11,9 @@
 		padding: 0.3em 0.5em;
 		margin: 0.5em 0;
 		border-radius: 4px;
-		border: 1px solid RGBA(127, 127, 127, 0.2);
-		background-color: white;
+		border: 1px solid var(--d3c-color-border);
+		background-color: var(--d3c-color-background);
+		color: var(--d3c-color-text);
 		white-space: nowrap;
 		overflow: hidden;
 		text-overflow: ellipsis;
@@ -32,15 +33,15 @@
 	}
 
 	.d3c-1633424238:hover {
-		background-color: RGBA(127, 127, 127, 0.1);
+		background-color: var(--d3c-color-hovered);
 	}
 
 	.d3c-1633424238:active {
-		background-color: RGBA(127, 127, 127, 0.2);
+		background-color: var(--d3c-color-clicked);
 	}
 
 	.d3c-1633424238-selected {
-		background-color: RGBA(127, 127, 127, 0.2) !important;
+		background-color: var(--d3c-color-selected) !important;
 	}
 </style>
 
diff --git a/components/input/button_vgen.go b/components/input/button_vgen.go
index 4dc18a5..0372599 100644
--- a/components/input/button_vgen.go
+++ b/components/input/button_vgen.go
@@ -55,7 +55,7 @@ func (c *Button) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-1633424238 {\n\t\tdisplay: flex;\n\t\talign-items: center;\n\t\tgap: 0.5em;\n\t\ttext-decoration: none;\n\t\tpadding: 0.3em 0.5em;\n\t\tmargin: 0.5em 0;\n\t\tborder-radius: 4px;\n\t\tborder: 1px solid RGBA(127, 127, 127, 0.2);\n\t\tbackground-color: white;\n\t\twhite-space: nowrap;\n\t\toverflow: hidden;\n\t\ttext-overflow: ellipsis;\n\t\tfont-size: 1em;\n\t\tfont-family: \"Segoe UI\", sans-serif;\n\t\tmin-height: 2em;\n\t\tuser-select: none;\n\t}\n\n\t.d3c-1633424238.d3c-button-vertical {\n\t\tflex-direction: column;\n\t}\n\n\t.d3c-1633357633-sidebar .d3c-1633424238, .d3c-1633357633-menu .d3c-1633424238 {\n\t\tborder: none;\n\t\tbackground-color: transparent;\n\t}\n\n\t.d3c-1633424238:hover {\n\t\tbackground-color: RGBA(127, 127, 127, 0.1);\n\t}\n\n\t.d3c-1633424238:active {\n\t\tbackground-color: RGBA(127, 127, 127, 0.2);\n\t}\n\n\t.d3c-1633424238-selected {\n\t\tbackground-color: RGBA(127, 127, 127, 0.2) !important;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-1633424238 {\n\t\tdisplay: flex;\n\t\talign-items: center;\n\t\tgap: 0.5em;\n\t\ttext-decoration: none;\n\t\tpadding: 0.3em 0.5em;\n\t\tmargin: 0.5em 0;\n\t\tborder-radius: 4px;\n\t\tborder: 1px solid var(--d3c-color-border);\n\t\tbackground-color: var(--d3c-color-background);\n\t\tcolor: var(--d3c-color-text);\n\t\twhite-space: nowrap;\n\t\toverflow: hidden;\n\t\ttext-overflow: ellipsis;\n\t\tfont-size: 1em;\n\t\tfont-family: \"Segoe UI\", sans-serif;\n\t\tmin-height: 2em;\n\t\tuser-select: none;\n\t}\n\n\t.d3c-1633424238.d3c-button-vertical {\n\t\tflex-direction: column;\n\t}\n\n\t.d3c-1633357633-sidebar .d3c-1633424238, .d3c-1633357633-menu .d3c-1633424238 {\n\t\tborder: none;\n\t\tbackground-color: transparent;\n\t}\n\n\t.d3c-1633424238:hover {\n\t\tbackground-color: var(--d3c-color-hovered);\n\t}\n\n\t.d3c-1633424238:active {\n\t\tbackground-color: var(--d3c-color-clicked);\n\t}\n\n\t.d3c-1633424238-selected {\n\t\tbackground-color: var(--d3c-color-selected) !important;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/components/layout/container.vugu b/components/layout/container.vugu
index 9035cea..d335381 100644
--- a/components/layout/container.vugu
+++ b/components/layout/container.vugu
@@ -5,6 +5,8 @@
 <style>
 	.d3c-1634593574 {
 		margin: 1em;
+		background-color: var(--d3c-color-background);
+		color: var(--d3c-color-text);
 	}
 </style>
 
diff --git a/components/layout/container_vgen.go b/components/layout/container_vgen.go
index f5ead69..572aaeb 100644
--- a/components/layout/container_vgen.go
+++ b/components/layout/container_vgen.go
@@ -47,7 +47,7 @@ func (c *Container) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-1634593574 {\n\t\tmargin: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-1634593574 {\n\t\tmargin: 1em;\n\t\tbackground-color: var(--d3c-color-background);\n\t\tcolor: var(--d3c-color-text);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/components/layout/layer-container.vugu b/components/layout/layer-container.vugu
new file mode 100644
index 0000000..41fa7ab
--- /dev/null
+++ b/components/layout/layer-container.vugu
@@ -0,0 +1,26 @@
+<div vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-1684364241"}'>
+	<vg-comp expr="c.DefaultSlot"></vg-comp>
+</div>
+
+<style>
+	.d3c-1684364241 {
+		margin: 0.5em 0;
+		padding: 0.5em;
+		border-radius: 4px;
+		background-color: var(--d3c-color-background);
+		color: var(--d3c-color-text);
+	}
+</style>
+
+<script type="application/x-go">
+	import (
+		"git.d3nexus.de/Dadido3/D3vugu-components/utils"
+		"github.com/vugu/vugu"
+	)
+
+	type LayerContainer struct {
+		AttrMap vugu.AttrMap
+
+		DefaultSlot vugu.Builder `vugu:"data"`
+	}
+</script>
diff --git a/components/layout/layer-container_vgen.go b/components/layout/layer-container_vgen.go
new file mode 100644
index 0000000..30c19d6
--- /dev/null
+++ b/components/layout/layer-container_vgen.go
@@ -0,0 +1,60 @@
+package layout
+
+// Code generated by vugu via vugugen. Please regenerate instead of editing or add additional code in a separate file. DO NOT EDIT.
+
+import "fmt"
+import "reflect"
+import "github.com/vugu/vjson"
+import "github.com/vugu/vugu"
+import js "github.com/vugu/vugu/js"
+
+import (
+	"git.d3nexus.de/Dadido3/D3vugu-components/utils"
+)
+
+type LayerContainer struct {
+	AttrMap	vugu.AttrMap
+
+	DefaultSlot	vugu.Builder	`vugu:"data"`
+}
+
+func (c *LayerContainer) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+
+	vgout = &vugu.BuildOut{}
+
+	var vgiterkey interface{}
+	_ = vgiterkey
+	var vgn *vugu.VGNode
+	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "div", Attr: []vugu.VGAttribute(nil)}
+	vgout.Out = append(vgout.Out, vgn)	// root for output
+	vgn.AddAttrList(utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-1684364241"})
+	{
+		vgparent := vgn
+		_ = vgparent
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
+		vgparent.AppendChild(vgn)
+		{
+			var vgcomp vugu.Builder = c.DefaultSlot
+			if vgcomp != nil {
+				vgin.BuildEnv.WireComponent(vgcomp)
+				vgout.Components = append(vgout.Components, vgcomp)
+				vgn = &vugu.VGNode{Component: vgcomp}
+				vgparent.AppendChild(vgn)
+			}
+		}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
+		vgparent.AppendChild(vgn)
+	}
+	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
+	{
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-1684364241 {\n\t\tmargin: 0.5em 0;\n\t\tpadding: 0.5em;\n\t\tborder-radius: 4px;\n\t\tbackground-color: var(--d3c-color-background);\n\t\tcolor: var(--d3c-color-text);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+	}
+	vgout.AppendCSS(vgn)
+	return vgout
+}
+
+// 'fix' unused imports
+var _ fmt.Stringer
+var _ reflect.Type
+var _ vjson.RawMessage
+var _ js.Value
diff --git a/components/layout/list-container.vugu b/components/layout/list-container.vugu
index 72b8939..045823b 100644
--- a/components/layout/list-container.vugu
+++ b/components/layout/list-container.vugu
@@ -11,9 +11,7 @@
 	}
 
 	.d3c-1684350837 > * {
-		padding: 0.5em;
-		border-radius: 4px;
-		background-color: RGB(240, 240, 240);
+		margin: 0 !important;
 	}
 </style>
 
diff --git a/components/layout/list-container_vgen.go b/components/layout/list-container_vgen.go
index 44c1e9d..40ac604 100644
--- a/components/layout/list-container_vgen.go
+++ b/components/layout/list-container_vgen.go
@@ -47,7 +47,7 @@ func (c *ListContainer) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-1684350837 {\n\t\tdisplay: flex;\n\t\tflex-direction: column;\n\t\tgap: 0.25em;\n\t\tmargin: 0.5em 0;\n\t}\n\n\t.d3c-1684350837 > * {\n\t\tdisplay: flex;\n\t\tflex-wrap: wrap;\n\t\tgap: 1em;\n\t\tpadding: 0.5em;\n\t\tborder-radius: 4px;\n\t\tbackground-color: RGB(240, 240, 240);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-1684350837 {\n\t\tdisplay: flex;\n\t\tflex-direction: column;\n\t\tgap: 0.25em;\n\t\tmargin: 0.5em 0;\n\t}\n\n\t.d3c-1684350837 > * {\n\t\tmargin: 0 !important;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/components/navigation/pagination.go b/components/navigation/pagination.go
index f0515e6..4f20951 100644
--- a/components/navigation/pagination.go
+++ b/components/navigation/pagination.go
@@ -80,7 +80,7 @@ func (c *Pagination) Compute(ctx vugu.ComputeCtx) {
 		if pageCounter < page.Page && page.Page <= c.Pages {
 			pageCounter = page.Page
 			if page.Page == c.Page {
-				page.Class = "d3c-1684167638-selected"
+				page.Class = "d3c-color-accent"
 			}
 			buttonsFiltered = append(buttonsFiltered, page)
 		}
diff --git a/components/navigation/pagination.vugu b/components/navigation/pagination.vugu
index eb58ee9..2c7c7ba 100644
--- a/components/navigation/pagination.vugu
+++ b/components/navigation/pagination.vugu
@@ -11,36 +11,31 @@
 		gap: 0.5em;
 		margin: 0.5em 0;
 		/*border-radius: 4px;
-		border: 1px solid RGBA(127, 127, 127, 0.2);*/
+		border: 1px solid var(--d3c-color-border);*/
 		/*width: min-content;*/
 		overflow: hidden;
 	}
 
 	.d3c-1684167638 button {
 		padding: 0;
-		background-color: white;
 		white-space: nowrap;
 		font-size: 1em;
 		font-family: "Segoe UI", sans-serif;
 		border-radius: 4px;
-		border: 1px solid RGBA(127, 127, 127, 0.2);
-		background-color: white;
+		border: 1px solid var(--d3c-color-border);
+		background-color: var(--d3c-color-background);
+		color: var(--d3c-color-text);
 		user-select: none;
 		min-width: 2em;
 		height: 2em;
 	}
 
 	.d3c-1684167638 button:hover {
-		background-color: RGBA(127, 127, 127, 0.1);
+		background-color: var(--d3c-color-hovered);
 	}
 
 	.d3c-1684167638 button:active {
-		background-color: RGBA(127, 127, 127, 0.2);
-	}
-
-	.d3c-1684167638-selected {
-		background-color: RGBA(64, 100, 188, 1) !important;
-		color: white;
+		background-color: var(--d3c-color-clicked);
 	}
 </style>
 
diff --git a/components/navigation/pagination_vgen.go b/components/navigation/pagination_vgen.go
index dedb9a7..8487642 100644
--- a/components/navigation/pagination_vgen.go
+++ b/components/navigation/pagination_vgen.go
@@ -102,7 +102,7 @@ func (c *Pagination) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-1684167638 {\n\t\tdisplay: flex;\n\t\tflex-wrap: wrap;\n\t\tgap: 0.5em;\n\t\tmargin: 0.5em 0;\n\t\t/*border-radius: 4px;\n\t\tborder: 1px solid RGBA(127, 127, 127, 0.2);*/\n\t\t/*width: min-content;*/\n\t\toverflow: hidden;\n\t}\n\n\t.d3c-1684167638 button {\n\t\tpadding: 0;\n\t\tbackground-color: white;\n\t\twhite-space: nowrap;\n\t\tfont-size: 1em;\n\t\tfont-family: \"Segoe UI\", sans-serif;\n\t\tborder-radius: 4px;\n\t\tborder: 1px solid RGBA(127, 127, 127, 0.2);\n\t\tbackground-color: white;\n\t\tuser-select: none;\n\t\tmin-width: 2em;\n\t\theight: 2em;\n\t}\n\n\t.d3c-1684167638 button:hover {\n\t\tbackground-color: RGBA(127, 127, 127, 0.1);\n\t}\n\n\t.d3c-1684167638 button:active {\n\t\tbackground-color: RGBA(127, 127, 127, 0.2);\n\t}\n\n\t.d3c-1684167638-selected {\n\t\tbackground-color: RGBA(64, 100, 188, 1) !important;\n\t\tcolor: white;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-1684167638 {\n\t\tdisplay: flex;\n\t\tflex-wrap: wrap;\n\t\tgap: 0.5em;\n\t\tmargin: 0.5em 0;\n\t\t/*border-radius: 4px;\n\t\tborder: 1px solid var(--d3c-color-border);*/\n\t\t/*width: min-content;*/\n\t\toverflow: hidden;\n\t}\n\n\t.d3c-1684167638 button {\n\t\tpadding: 0;\n\t\twhite-space: nowrap;\n\t\tfont-size: 1em;\n\t\tfont-family: \"Segoe UI\", sans-serif;\n\t\tborder-radius: 4px;\n\t\tborder: 1px solid var(--d3c-color-border);\n\t\tbackground-color: var(--d3c-color-background);\n\t\tcolor: var(--d3c-color-text);\n\t\tuser-select: none;\n\t\tmin-width: 2em;\n\t\theight: 2em;\n\t}\n\n\t.d3c-1684167638 button:hover {\n\t\tbackground-color: var(--d3c-color-hovered);\n\t}\n\n\t.d3c-1684167638 button:active {\n\t\tbackground-color: var(--d3c-color-clicked);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/components/navigation/sidebar-entry.vugu b/components/navigation/sidebar-entry.vugu
index ef2cb3e..d392127 100644
--- a/components/navigation/sidebar-entry.vugu
+++ b/components/navigation/sidebar-entry.vugu
@@ -11,8 +11,9 @@
 		padding: 0.3em 0.5em;
 		margin: 0.5em 0;
 		border-radius: 4px;
-		border: 1px solid RGBA(127, 127, 127, 0.3);
-		background-color: white;
+		border: 1px solid var(--d3c-color-border);
+		background-color: var(--d3c-color-background);
+		color: var(--d3c-color-text);
 		white-space: nowrap;
 		overflow: hidden;
 		text-overflow: ellipsis;
@@ -32,15 +33,15 @@
 	}
 
 	.d3c-1683622560:hover {
-		background-color: RGBA(127, 127, 127, 0.1);
+		background-color: var(--d3c-color-hovered);
 	}
 
 	.d3c-1683622560:active {
-		background-color: RGBA(127, 127, 127, 0.2);
+		background-color: var(--d3c-color-clicked);
 	}
 
 	.d3c-1683622560-selected {
-		background-color: RGBA(127, 127, 127, 0.2) !important;
+		background-color: var(--d3c-color-selected) !important;
 	}
 
 	.d3c-1633357633-sidebar-minimized .d3c-1683622560 > *:not(:first-child) {
diff --git a/components/navigation/sidebar-entry_vgen.go b/components/navigation/sidebar-entry_vgen.go
index 009eff7..dcfc23f 100644
--- a/components/navigation/sidebar-entry_vgen.go
+++ b/components/navigation/sidebar-entry_vgen.go
@@ -55,7 +55,7 @@ func (c *SidebarEntry) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-1683622560 {\n\t\tdisplay: flex;\n\t\talign-items: center;\n\t\tgap: 0.5em;\n\t\ttext-decoration: none;\n\t\tpadding: 0.3em 0.5em;\n\t\tmargin: 0.5em 0;\n\t\tborder-radius: 4px;\n\t\tborder: 1px solid RGBA(127, 127, 127, 0.3);\n\t\tbackground-color: white;\n\t\twhite-space: nowrap;\n\t\toverflow: hidden;\n\t\ttext-overflow: ellipsis;\n\t\tfont-size: 1em;\n\t\tfont-family: \"Segoe UI\", sans-serif;\n\t\tmin-height: 2em;\n\t\tuser-select: none;\n\t}\n\n\t.d3c-1683622560.d3c-button-vertical {\n\t\tflex-direction: column;\n\t}\n\n\t.d3c-1633357633-sidebar .d3c-1683622560, .d3c-1633357633-menu .d3c-1683622560 {\n\t\tborder: none;\n\t\tbackground-color: transparent;\n\t}\n\n\t.d3c-1683622560:hover {\n\t\tbackground-color: RGBA(127, 127, 127, 0.1);\n\t}\n\n\t.d3c-1683622560:active {\n\t\tbackground-color: RGBA(127, 127, 127, 0.2);\n\t}\n\n\t.d3c-1683622560-selected {\n\t\tbackground-color: RGBA(127, 127, 127, 0.2) !important;\n\t}\n\n\t.d3c-1633357633-sidebar-minimized .d3c-1683622560 > *:not(:first-child) {\n\t\tdisplay: none;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-1683622560 {\n\t\tdisplay: flex;\n\t\talign-items: center;\n\t\tgap: 0.5em;\n\t\ttext-decoration: none;\n\t\tpadding: 0.3em 0.5em;\n\t\tmargin: 0.5em 0;\n\t\tborder-radius: 4px;\n\t\tborder: 1px solid var(--d3c-color-border);\n\t\tbackground-color: var(--d3c-color-background);\n\t\tcolor: var(--d3c-color-text);\n\t\twhite-space: nowrap;\n\t\toverflow: hidden;\n\t\ttext-overflow: ellipsis;\n\t\tfont-size: 1em;\n\t\tfont-family: \"Segoe UI\", sans-serif;\n\t\tmin-height: 2em;\n\t\tuser-select: none;\n\t}\n\n\t.d3c-1683622560.d3c-button-vertical {\n\t\tflex-direction: column;\n\t}\n\n\t.d3c-1633357633-sidebar .d3c-1683622560, .d3c-1633357633-menu .d3c-1683622560 {\n\t\tborder: none;\n\t\tbackground-color: transparent;\n\t}\n\n\t.d3c-1683622560:hover {\n\t\tbackground-color: var(--d3c-color-hovered);\n\t}\n\n\t.d3c-1683622560:active {\n\t\tbackground-color: var(--d3c-color-clicked);\n\t}\n\n\t.d3c-1683622560-selected {\n\t\tbackground-color: var(--d3c-color-selected) !important;\n\t}\n\n\t.d3c-1633357633-sidebar-minimized .d3c-1683622560 > *:not(:first-child) {\n\t\tdisplay: none;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/components/navigation/sidebar.vugu b/components/navigation/sidebar.vugu
index 5078359..55d1706 100644
--- a/components/navigation/sidebar.vugu
+++ b/components/navigation/sidebar.vugu
@@ -1,5 +1,5 @@
 <div vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-1633357633"}'>
-	<div :class='"d3c-1633357633-sidebar " + c.sidebarClasses'>
+	<div :class='"d3c-1633357633-sidebar d3c-color-layer-1 " + c.sidebarClasses'>
 		<div class="d3c-1633357633-sidebar-menu">
 			<input:Button @Click="c.handleMenuButton(event)">
 				<vg-slot name="SymbolSlot"><icons:LGlobalNav></icons:LGlobalNav></vg-slot>
@@ -16,7 +16,7 @@
 	</div>
 
 	<div class="d3c-1633357633-body">
-		<div class="d3c-1633357633-menu">
+		<div class="d3c-1633357633-menu d3c-color-layer-1">
 			<input:Button @Click="c.handleMenuButton(event)">
 				<vg-slot name="SymbolSlot"><icons:LGlobalNav></icons:LGlobalNav></vg-slot>
 			</input:Button>
@@ -32,25 +32,29 @@
 		height: 100%;
 		position: absolute;
 		display: flex;
+		background-color: var(--d3c-color-background);
+		color: var(--d3c-color-text);
 	}
 
 	.d3c-1633357633-menu {
 		width: 100%;
-		border-bottom: 1px solid RGBA(127, 127, 127, 0.2);
+		border-bottom: 1px solid var(--d3c-color-border);
 		display: flex;
 		position: relative;
 		padding: 0 0.5em;
 		box-sizing: border-box;
-		background-color: RGB(240, 240, 240);
+		background-color: var(--d3c-color-background);
+		color: var(--d3c-color-text);
 	}
 
 	.d3c-1633357633-sidebar {
 		height: 100%;
-		border-right: 1px solid RGBA(127, 127, 127, 0.2);
+		border-right: 1px solid var(--d3c-color-border);
 		padding: 0 0.5em;
 		display: flex;
 		flex-direction: column;
-		background-color: RGB(240, 240, 240);
+		background-color: var(--d3c-color-background);
+		color: var(--d3c-color-text);
 		z-index: 1;
 	}
 
diff --git a/components/navigation/sidebar_vgen.go b/components/navigation/sidebar_vgen.go
index 75cbe31..af180d8 100644
--- a/components/navigation/sidebar_vgen.go
+++ b/components/navigation/sidebar_vgen.go
@@ -31,7 +31,7 @@ func (c *Sidebar) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "div", Attr: []vugu.VGAttribute(nil)}
 		vgparent.AppendChild(vgn)
-		vgn.AddAttrInterface("class", "d3c-1633357633-sidebar "+c.sidebarClasses)
+		vgn.AddAttrInterface("class", "d3c-1633357633-sidebar d3c-color-layer-1 "+c.sidebarClasses)
 		{
 			vgparent := vgn
 			_ = vgparent
@@ -155,7 +155,7 @@ func (c *Sidebar) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 			_ = vgparent
 			vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
 			vgparent.AppendChild(vgn)
-			vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "div", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-1633357633-menu"}}}
+			vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "div", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-1633357633-menu d3c-color-layer-1"}}}
 			vgparent.AppendChild(vgn)
 			{
 				vgparent := vgn
@@ -233,7 +233,7 @@ func (c *Sidebar) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-1633357633 {\n\t\twidth: 100%;\n\t\theight: 100%;\n\t\tposition: absolute;\n\t\tdisplay: flex;\n\t}\n\n\t.d3c-1633357633-menu {\n\t\twidth: 100%;\n\t\tborder-bottom: 1px solid RGBA(127, 127, 127, 0.2);\n\t\tdisplay: flex;\n\t\tposition: relative;\n\t\tpadding: 0 0.5em;\n\t\tbox-sizing: border-box;\n\t\tbackground-color: RGB(240, 240, 240);\n\t}\n\n\t.d3c-1633357633-sidebar {\n\t\theight: 100%;\n\t\tborder-right: 1px solid RGBA(127, 127, 127, 0.2);\n\t\tpadding: 0 0.5em;\n\t\tdisplay: flex;\n\t\tflex-direction: column;\n\t\tbackground-color: RGB(240, 240, 240);\n\t\tz-index: 1;\n\t}\n\n\t.d3c-1633357633-sidebar-menu {\n\t\t/*display: flex;\n\t\tflex-direction: column;*/\n\t}\n\n\t@media (min-aspect-ratio: 1/1) {\n\t\t.d3c-1633357633-menu {\n\t\t\tdisplay: none;\n\t\t}\n\t}\n\t@media not all and (min-aspect-ratio: 1/1) {\n\t\t.d3c-1633357633-sidebar-minimized {\n\t\t\tdisplay: none;\n\t\t}\n\t\t.d3c-1633357633-sidebar {\n\t\t\tposition: absolute;\n\t\t}\n\t}\n\n\t.d3c-1633357633-sidebar-entries {\n\t\toverflow-y: scroll;\n\t}\n\n\t.d3c-1633357633-sidebar-entries > * {\n\t\twidth: 100%;\n\t}\n\n\t.d3c-1633357633-bottom-entries > * {\n\t\twidth: 100%;\n\t}\n\n\t.d3c-1633357633-spacer {\n\t\tflex-grow: 1;\n\t}\n\n\t.d3c-1633357633-body {\n\t\toverflow: auto;\n\t\tflex-grow: 1;\n\t\tflex-shrink: 1;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-1633357633 {\n\t\twidth: 100%;\n\t\theight: 100%;\n\t\tposition: absolute;\n\t\tdisplay: flex;\n\t\tbackground-color: var(--d3c-color-background);\n\t\tcolor: var(--d3c-color-text);\n\t}\n\n\t.d3c-1633357633-menu {\n\t\twidth: 100%;\n\t\tborder-bottom: 1px solid var(--d3c-color-border);\n\t\tdisplay: flex;\n\t\tposition: relative;\n\t\tpadding: 0 0.5em;\n\t\tbox-sizing: border-box;\n\t\tbackground-color: var(--d3c-color-background);\n\t\tcolor: var(--d3c-color-text);\n\t}\n\n\t.d3c-1633357633-sidebar {\n\t\theight: 100%;\n\t\tborder-right: 1px solid var(--d3c-color-border);\n\t\tpadding: 0 0.5em;\n\t\tdisplay: flex;\n\t\tflex-direction: column;\n\t\tbackground-color: var(--d3c-color-background);\n\t\tcolor: var(--d3c-color-text);\n\t\tz-index: 1;\n\t}\n\n\t.d3c-1633357633-sidebar-menu {\n\t\t/*display: flex;\n\t\tflex-direction: column;*/\n\t}\n\n\t@media (min-aspect-ratio: 1/1) {\n\t\t.d3c-1633357633-menu {\n\t\t\tdisplay: none;\n\t\t}\n\t}\n\t@media not all and (min-aspect-ratio: 1/1) {\n\t\t.d3c-1633357633-sidebar-minimized {\n\t\t\tdisplay: none;\n\t\t}\n\t\t.d3c-1633357633-sidebar {\n\t\t\tposition: absolute;\n\t\t}\n\t}\n\n\t.d3c-1633357633-sidebar-entries {\n\t\toverflow-y: scroll;\n\t}\n\n\t.d3c-1633357633-sidebar-entries > * {\n\t\twidth: 100%;\n\t}\n\n\t.d3c-1633357633-bottom-entries > * {\n\t\twidth: 100%;\n\t}\n\n\t.d3c-1633357633-spacer {\n\t\tflex-grow: 1;\n\t}\n\n\t.d3c-1633357633-body {\n\t\toverflow: auto;\n\t\tflex-grow: 1;\n\t\tflex-shrink: 1;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/components/view/code-inline.vugu b/components/view/code-inline.vugu
index 1375fe6..1838ac9 100644
--- a/components/view/code-inline.vugu
+++ b/components/view/code-inline.vugu
@@ -1,10 +1,11 @@
-<span vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-1634910850"}'><vg-comp expr="c.DefaultSlot"></vg-comp></span>
+<span vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-1634910850 d3c-color-layer-1"}'><vg-comp expr="c.DefaultSlot"></vg-comp></span>
 
 <style>
 	.d3c-1634910850 {
 		border-radius: 4px;
 		font-family: monospace;
-		background-color: RGBA(127, 127, 127, 0.1);
+		background-color: var(--d3c-color-background);
+		color: var(--d3c-color-text);
 	}
 </style>
 
diff --git a/components/view/code-inline_vgen.go b/components/view/code-inline_vgen.go
index 1d2e10e..5e38cab 100644
--- a/components/view/code-inline_vgen.go
+++ b/components/view/code-inline_vgen.go
@@ -27,7 +27,7 @@ func (c *CodeInline) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 	var vgn *vugu.VGNode
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "span", Attr: []vugu.VGAttribute(nil)}
 	vgout.Out = append(vgout.Out, vgn)	// root for output
-	vgn.AddAttrList(utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-1634910850"})
+	vgn.AddAttrList(utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-1634910850 d3c-color-layer-1"})
 	{
 		vgparent := vgn
 		_ = vgparent
@@ -43,7 +43,7 @@ func (c *CodeInline) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-1634910850 {\n\t\tborder-radius: 4px;\n\t\tfont-family: monospace;\n\t\tbackground-color: RGBA(127, 127, 127, 0.1);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-1634910850 {\n\t\tborder-radius: 4px;\n\t\tfont-family: monospace;\n\t\tbackground-color: var(--d3c-color-background);\n\t\tcolor: var(--d3c-color-text);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/components/view/code.vugu b/components/view/code.vugu
index acd25e4..e07aed9 100644
--- a/components/view/code.vugu
+++ b/components/view/code.vugu
@@ -1,4 +1,4 @@
-<div vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-1683741854"}'>
+<div vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-1683741854 d3c-color-layer-1"}'>
 	<vg-comp expr="c.DefaultSlot"></vg-comp>
 </div>
 
@@ -8,7 +8,8 @@
 		padding: 0.5em;
 		margin: 1em 0;
 		font-family: monospace;
-		background-color: RGBA(127, 127, 127, 0.1);
+		background-color: var(--d3c-color-background);
+		color: var(--d3c-color-text);
 	}
 </style>
 
diff --git a/components/view/code_vgen.go b/components/view/code_vgen.go
index 15507af..2a7a040 100644
--- a/components/view/code_vgen.go
+++ b/components/view/code_vgen.go
@@ -27,7 +27,7 @@ func (c *Code) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 	var vgn *vugu.VGNode
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "div", Attr: []vugu.VGAttribute(nil)}
 	vgout.Out = append(vgout.Out, vgn)	// root for output
-	vgn.AddAttrList(utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-1683741854"})
+	vgn.AddAttrList(utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-1683741854 d3c-color-layer-1"})
 	{
 		vgparent := vgn
 		_ = vgparent
@@ -47,7 +47,7 @@ func (c *Code) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-1683741854 {\n\t\tborder-radius: 4px;\n\t\tpadding: 0.5em;\n\t\tmargin: 1em 0;\n\t\tfont-family: monospace;\n\t\tbackground-color: RGBA(127, 127, 127, 0.1);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-1683741854 {\n\t\tborder-radius: 4px;\n\t\tpadding: 0.5em;\n\t\tmargin: 1em 0;\n\t\tfont-family: monospace;\n\t\tbackground-color: var(--d3c-color-background);\n\t\tcolor: var(--d3c-color-text);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/components/view/tag.vugu b/components/view/tag.vugu
index e4ef53e..02e3ef4 100644
--- a/components/view/tag.vugu
+++ b/components/view/tag.vugu
@@ -2,9 +2,10 @@
 
 <style>
 	.d3c-1684347260 {
-		padding: 0 0.5em;
+		padding: 0.1em 0.5em;
 		border-radius: 4px;
-		background-color: RGBA(127, 127, 127, 0.1);
+		background-color: var(--d3c-color-background);
+		color: var(--d3c-color-text);
 	}
 </style>
 
diff --git a/components/view/tag_vgen.go b/components/view/tag_vgen.go
index 94d8683..e67d205 100644
--- a/components/view/tag_vgen.go
+++ b/components/view/tag_vgen.go
@@ -43,7 +43,7 @@ func (c *Tag) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-1684347260 {\n\t\tpadding: 0 0.5em;\n\t\tborder-radius: 4px;\n\t\tbackground-color: RGBA(127, 127, 127, 0.1);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-1684347260 {\n\t\tpadding: 0.1em 0.5em;\n\t\tborder-radius: 4px;\n\t\tbackground-color: var(--d3c-color-background);\n\t\tcolor: var(--d3c-color-text);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/empty.vugu b/icons/empty.vugu
index 73618b4..9e1d58f 100644
--- a/icons/empty.vugu
+++ b/icons/empty.vugu
@@ -4,6 +4,22 @@
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/empty_vgen.go b/icons/empty_vgen.go
index ff5473a..1a7eb34 100644
--- a/icons/empty_vgen.go
+++ b/icons/empty_vgen.go
@@ -28,7 +28,7 @@ func (c *Empty) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 	vgn.AddAttrList(utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon"})
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-arrow-down.vugu b/icons/l-arrow-down.vugu
index d096179..117a6d2 100644
--- a/icons/l-arrow-down.vugu
+++ b/icons/l-arrow-down.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M13.5 9.5l-6 6 -6 -6m6 6l0 -15" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M13.5 9.5l-6 6 -6 -6m6 6l0 -15" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-arrow-down_vgen.go b/icons/l-arrow-down_vgen.go
index d3b6f95..a001c0e 100644
--- a/icons/l-arrow-down_vgen.go
+++ b/icons/l-arrow-down_vgen.go
@@ -31,14 +31,14 @@ func (c *LArrowDown) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M13.5 9.5l-6 6 -6 -6m6 6l0 -15"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M13.5 9.5l-6 6 -6 -6m6 6l0 -15"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-arrow-left.vugu b/icons/l-arrow-left.vugu
index 7703628..b250e63 100644
--- a/icons/l-arrow-left.vugu
+++ b/icons/l-arrow-left.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M6.5 14.5l-6 -6 6 -6m-6 6l15 0" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M6.5 14.5l-6 -6 6 -6m-6 6l15 0" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-arrow-left_vgen.go b/icons/l-arrow-left_vgen.go
index 618b0b0..10f8b7e 100644
--- a/icons/l-arrow-left_vgen.go
+++ b/icons/l-arrow-left_vgen.go
@@ -31,14 +31,14 @@ func (c *LArrowLeft) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M6.5 14.5l-6 -6 6 -6m-6 6l15 0"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M6.5 14.5l-6 -6 6 -6m-6 6l15 0"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-arrow-right.vugu b/icons/l-arrow-right.vugu
index 5eb94aa..bd7ca3b 100644
--- a/icons/l-arrow-right.vugu
+++ b/icons/l-arrow-right.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M9.5 14.5l6 -6 -6 -6m6 6l-15 0" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M9.5 14.5l6 -6 -6 -6m6 6l-15 0" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-arrow-right_vgen.go b/icons/l-arrow-right_vgen.go
index 009c302..6449748 100644
--- a/icons/l-arrow-right_vgen.go
+++ b/icons/l-arrow-right_vgen.go
@@ -31,14 +31,14 @@ func (c *LArrowRight) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M9.5 14.5l6 -6 -6 -6m6 6l-15 0"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M9.5 14.5l6 -6 -6 -6m6 6l-15 0"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-arrow-up.vugu b/icons/l-arrow-up.vugu
index 6e99725..944c54c 100644
--- a/icons/l-arrow-up.vugu
+++ b/icons/l-arrow-up.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M13.5 6.5l-6 -6 -6 6m6 -6l0 15" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M13.5 6.5l-6 -6 -6 6m6 -6l0 15" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-arrow-up_vgen.go b/icons/l-arrow-up_vgen.go
index 731d89c..f77d812 100644
--- a/icons/l-arrow-up_vgen.go
+++ b/icons/l-arrow-up_vgen.go
@@ -31,14 +31,14 @@ func (c *LArrowUp) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M13.5 6.5l-6 -6 -6 6m6 -6l0 15"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M13.5 6.5l-6 -6 -6 6m6 -6l0 15"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-back-to-window.vugu b/icons/l-back-to-window.vugu
index 2cb4ca3..a666604 100644
--- a/icons/l-back-to-window.vugu
+++ b/icons/l-back-to-window.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M9.5 1.5l0 5 5 0m1 -6l-6 6m-3 8l0 -5 -5 0m-1 6l6 -6" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M9.5 1.5l0 5 5 0m1 -6l-6 6m-3 8l0 -5 -5 0m-1 6l6 -6" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-back-to-window_vgen.go b/icons/l-back-to-window_vgen.go
index 7fd0293..61cd31b 100644
--- a/icons/l-back-to-window_vgen.go
+++ b/icons/l-back-to-window_vgen.go
@@ -31,14 +31,14 @@ func (c *LBackToWindow) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M9.5 1.5l0 5 5 0m1 -6l-6 6m-3 8l0 -5 -5 0m-1 6l6 -6"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M9.5 1.5l0 5 5 0m1 -6l-6 6m-3 8l0 -5 -5 0m-1 6l6 -6"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-cancel.vugu b/icons/l-cancel.vugu
index 74b5440..be75e9c 100644
--- a/icons/l-cancel.vugu
+++ b/icons/l-cancel.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M1.5 2.5l12 12m-12 0l12 -12" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M1.5 2.5l12 12m-12 0l12 -12" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-cancel_vgen.go b/icons/l-cancel_vgen.go
index d9947ee..4fb07e8 100644
--- a/icons/l-cancel_vgen.go
+++ b/icons/l-cancel_vgen.go
@@ -31,14 +31,14 @@ func (c *LCancel) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M1.5 2.5l12 12m-12 0l12 -12"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M1.5 2.5l12 12m-12 0l12 -12"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-chevron-down.vugu b/icons/l-chevron-down.vugu
index d433132..636e3a3 100644
--- a/icons/l-chevron-down.vugu
+++ b/icons/l-chevron-down.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<polyline class="d3c-icon-stroke" points="1.5,5.5 7.5,11.5 13.5,5.5" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<polyline class="d3c-icon-stroke" points="1.5,5.5 7.5,11.5 13.5,5.5" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-chevron-down_vgen.go b/icons/l-chevron-down_vgen.go
index b027919..b905914 100644
--- a/icons/l-chevron-down_vgen.go
+++ b/icons/l-chevron-down_vgen.go
@@ -31,14 +31,14 @@ func (c *LChevronDown) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "polyline", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "points", Val: "1.5,5.5 7.5,11.5 13.5,5.5"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "polyline", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "points", Val: "1.5,5.5 7.5,11.5 13.5,5.5"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-chevron-left.vugu b/icons/l-chevron-left.vugu
index 34285b8..ae032f7 100644
--- a/icons/l-chevron-left.vugu
+++ b/icons/l-chevron-left.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<polyline class="d3c-icon-stroke" points="10.5,2.5 4.5,8.5 10.5,14.5 " stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<polyline class="d3c-icon-stroke" points="10.5,2.5 4.5,8.5 10.5,14.5 " stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-chevron-left_vgen.go b/icons/l-chevron-left_vgen.go
index b4f03d5..5992e67 100644
--- a/icons/l-chevron-left_vgen.go
+++ b/icons/l-chevron-left_vgen.go
@@ -31,14 +31,14 @@ func (c *LChevronLeft) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "polyline", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "points", Val: "10.5,2.5 4.5,8.5 10.5,14.5 "}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "polyline", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "points", Val: "10.5,2.5 4.5,8.5 10.5,14.5 "}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-chevron-right.vugu b/icons/l-chevron-right.vugu
index 15c70a0..4e6a0cf 100644
--- a/icons/l-chevron-right.vugu
+++ b/icons/l-chevron-right.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<polyline class="d3c-icon-stroke" points="5.5,2.5 11.5,8.5 5.5,14.5" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<polyline class="d3c-icon-stroke" points="5.5,2.5 11.5,8.5 5.5,14.5" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-chevron-right_vgen.go b/icons/l-chevron-right_vgen.go
index 9dd878d..03a085a 100644
--- a/icons/l-chevron-right_vgen.go
+++ b/icons/l-chevron-right_vgen.go
@@ -31,14 +31,14 @@ func (c *LChevronRight) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "polyline", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "points", Val: "5.5,2.5 11.5,8.5 5.5,14.5"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "polyline", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "points", Val: "5.5,2.5 11.5,8.5 5.5,14.5"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-chevron-up.vugu b/icons/l-chevron-up.vugu
index 71658a3..e69a9a7 100644
--- a/icons/l-chevron-up.vugu
+++ b/icons/l-chevron-up.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<polyline class="d3c-icon-stroke" points="1.5,10.5 7.5,4.5 13.5,10.5 " stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<polyline class="d3c-icon-stroke" points="1.5,10.5 7.5,4.5 13.5,10.5 " stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-chevron-up_vgen.go b/icons/l-chevron-up_vgen.go
index 909d4a3..140b267 100644
--- a/icons/l-chevron-up_vgen.go
+++ b/icons/l-chevron-up_vgen.go
@@ -31,14 +31,14 @@ func (c *LChevronUp) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "polyline", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "points", Val: "1.5,10.5 7.5,4.5 13.5,10.5 "}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "polyline", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "points", Val: "1.5,10.5 7.5,4.5 13.5,10.5 "}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-circle-minus.vugu b/icons/l-circle-minus.vugu
index 47b87cf..dc6e5f9 100644
--- a/icons/l-circle-minus.vugu
+++ b/icons/l-circle-minus.vugu
@@ -1,12 +1,28 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M4.5 8.5l6 0" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
-	<circle class="d3c-icon-stroke" cx="7.5" cy="8.5" r="7" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M4.5 8.5l6 0" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<circle class="d3c-icon-stroke" cx="7.5" cy="8.5" r="7" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-circle-minus_vgen.go b/icons/l-circle-minus_vgen.go
index 6565bac..0188bb9 100644
--- a/icons/l-circle-minus_vgen.go
+++ b/icons/l-circle-minus_vgen.go
@@ -31,18 +31,18 @@ func (c *LCircleMinus) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M4.5 8.5l6 0"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M4.5 8.5l6 0"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "7.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "8.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "7"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "7.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "8.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "7"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-circle-plus.vugu b/icons/l-circle-plus.vugu
index 8eadd66..305c8cb 100644
--- a/icons/l-circle-plus.vugu
+++ b/icons/l-circle-plus.vugu
@@ -1,12 +1,28 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M4.5 8.5l6 0m-3 -3l0 6" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
-	<circle class="d3c-icon-stroke" cx="7.5" cy="8.5" r="7" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M4.5 8.5l6 0m-3 -3l0 6" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<circle class="d3c-icon-stroke" cx="7.5" cy="8.5" r="7" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-circle-plus_vgen.go b/icons/l-circle-plus_vgen.go
index 397337e..39c7d8e 100644
--- a/icons/l-circle-plus_vgen.go
+++ b/icons/l-circle-plus_vgen.go
@@ -31,18 +31,18 @@ func (c *LCirclePlus) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M4.5 8.5l6 0m-3 -3l0 6"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M4.5 8.5l6 0m-3 -3l0 6"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "7.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "8.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "7"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "7.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "8.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "7"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-copy.vugu b/icons/l-copy.vugu
index 6443fcc..3774bcc 100644
--- a/icons/l-copy.vugu
+++ b/icons/l-copy.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M5.5 0.5l7 0c0.55,0 1,0.453 1,1l0 11c0,0.547 -0.452,1 -1,1l-7 0c-0.547,0 -1,-0.449 -1,-1l0 -11c0,-0.55 0.449,-1 1,-1zm5 15l-5.5 0c-1.551,0 -2.5,-0.946 -2.5,-2.5l0 -10" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M5.5 0.5l7 0c0.55,0 1,0.453 1,1l0 11c0,0.547 -0.452,1 -1,1l-7 0c-0.547,0 -1,-0.449 -1,-1l0 -11c0,-0.55 0.449,-1 1,-1zm5 15l-5.5 0c-1.551,0 -2.5,-0.946 -2.5,-2.5l0 -10" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-copy_vgen.go b/icons/l-copy_vgen.go
index 979ff7a..d76a506 100644
--- a/icons/l-copy_vgen.go
+++ b/icons/l-copy_vgen.go
@@ -31,14 +31,14 @@ func (c *LCopy) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M5.5 0.5l7 0c0.55,0 1,0.453 1,1l0 11c0,0.547 -0.452,1 -1,1l-7 0c-0.547,0 -1,-0.449 -1,-1l0 -11c0,-0.55 0.449,-1 1,-1zm5 15l-5.5 0c-1.551,0 -2.5,-0.946 -2.5,-2.5l0 -10"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M5.5 0.5l7 0c0.55,0 1,0.453 1,1l0 11c0,0.547 -0.452,1 -1,1l-7 0c-0.547,0 -1,-0.449 -1,-1l0 -11c0,-0.55 0.449,-1 1,-1zm5 15l-5.5 0c-1.551,0 -2.5,-0.946 -2.5,-2.5l0 -10"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-customize.vugu b/icons/l-customize.vugu
index 617abb1..7862ca5 100644
--- a/icons/l-customize.vugu
+++ b/icons/l-customize.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M5.591 10.95c-4.245,-2.45 -1.891,3.256 -5.086,4.55 6.575,-0.003 6.989,-3.452 5.086,-4.55zm-0.937 -0.453c3.513,-4.146 6.534,-7.632 9.851,-9.997 0.476,0.118 0.795,0.381 1,0.748 -2.109,3.961 -5.429,7.388 -9.014,10.767" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M5.591 10.95c-4.245,-2.45 -1.891,3.256 -5.086,4.55 6.575,-0.003 6.989,-3.452 5.086,-4.55zm-0.937 -0.453c3.513,-4.146 6.534,-7.632 9.851,-9.997 0.476,0.118 0.795,0.381 1,0.748 -2.109,3.961 -5.429,7.388 -9.014,10.767" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-customize_vgen.go b/icons/l-customize_vgen.go
index 2f3d47e..8f7388d 100644
--- a/icons/l-customize_vgen.go
+++ b/icons/l-customize_vgen.go
@@ -31,14 +31,14 @@ func (c *LCustomize) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M5.591 10.95c-4.245,-2.45 -1.891,3.256 -5.086,4.55 6.575,-0.003 6.989,-3.452 5.086,-4.55zm-0.937 -0.453c3.513,-4.146 6.534,-7.632 9.851,-9.997 0.476,0.118 0.795,0.381 1,0.748 -2.109,3.961 -5.429,7.388 -9.014,10.767"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M5.591 10.95c-4.245,-2.45 -1.891,3.256 -5.086,4.55 6.575,-0.003 6.989,-3.452 5.086,-4.55zm-0.937 -0.453c3.513,-4.146 6.534,-7.632 9.851,-9.997 0.476,0.118 0.795,0.381 1,0.748 -2.109,3.961 -5.429,7.388 -9.014,10.767"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-cut.vugu b/icons/l-cut.vugu
index 877918c..067d0ae 100644
--- a/icons/l-cut.vugu
+++ b/icons/l-cut.vugu
@@ -1,14 +1,30 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<circle class="d3c-icon-stroke" cx="4.5" cy="13.5" r="2" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
-	<circle class="d3c-icon-stroke" cx="11.5" cy="13.5" r="2" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
-	<path class="d3c-icon-stroke" d="M5.549 11.797l2.452 -3.983m1.072 -1.743l3.427 -5.571" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
-	<line class="d3c-icon-stroke" x1="10.452" y1="11.797" x2="3.5" y2= "0.5" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<circle class="d3c-icon-stroke" cx="4.5" cy="13.5" r="2" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<circle class="d3c-icon-stroke" cx="11.5" cy="13.5" r="2" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M5.549 11.797l2.452 -3.983m1.072 -1.743l3.427 -5.571" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<line class="d3c-icon-stroke" x1="10.452" y1="11.797" x2="3.5" y2= "0.5" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-cut_vgen.go b/icons/l-cut_vgen.go
index c5c1d41..fc91c5a 100644
--- a/icons/l-cut_vgen.go
+++ b/icons/l-cut_vgen.go
@@ -31,26 +31,26 @@ func (c *LCut) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "4.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "13.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "2"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "4.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "13.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "2"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "11.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "13.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "2"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "11.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "13.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "2"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M5.549 11.797l2.452 -3.983m1.072 -1.743l3.427 -5.571"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M5.549 11.797l2.452 -3.983m1.072 -1.743l3.427 -5.571"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "line", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "x1", Val: "10.452"}, vugu.VGAttribute{Namespace: "", Key: "y1", Val: "11.797"}, vugu.VGAttribute{Namespace: "", Key: "x2", Val: "3.5"}, vugu.VGAttribute{Namespace: "", Key: "y2", Val: "0.5"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "line", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "x1", Val: "10.452"}, vugu.VGAttribute{Namespace: "", Key: "y1", Val: "11.797"}, vugu.VGAttribute{Namespace: "", Key: "x2", Val: "3.5"}, vugu.VGAttribute{Namespace: "", Key: "y2", Val: "0.5"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-delete.vugu b/icons/l-delete.vugu
index a79c2ac..69e18be 100644
--- a/icons/l-delete.vugu
+++ b/icons/l-delete.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M5.988 2.5c0,-1.265 1,-2.014 2,-2 1,0.014 2,0.764 2,2m-7.5 0l1.5 13 8 0 1.5 -13m-7 4l0 5m3 -5l0 5m-8 -9l13 0" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M5.988 2.5c0,-1.265 1,-2.014 2,-2 1,0.014 2,0.764 2,2m-7.5 0l1.5 13 8 0 1.5 -13m-7 4l0 5m3 -5l0 5m-8 -9l13 0" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-delete_vgen.go b/icons/l-delete_vgen.go
index f51136b..49b8001 100644
--- a/icons/l-delete_vgen.go
+++ b/icons/l-delete_vgen.go
@@ -31,14 +31,14 @@ func (c *LDelete) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M5.988 2.5c0,-1.265 1,-2.014 2,-2 1,0.014 2,0.764 2,2m-7.5 0l1.5 13 8 0 1.5 -13m-7 4l0 5m3 -5l0 5m-8 -9l13 0"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M5.988 2.5c0,-1.265 1,-2.014 2,-2 1,0.014 2,0.764 2,2m-7.5 0l1.5 13 8 0 1.5 -13m-7 4l0 5m3 -5l0 5m-8 -9l13 0"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-deliver.vugu b/icons/l-deliver.vugu
index b428e8f..77ae380 100644
--- a/icons/l-deliver.vugu
+++ b/icons/l-deliver.vugu
@@ -1,14 +1,30 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<polyline class="fil1 str0" points="14.41,13.5 15.5,13.5 15.5,9.5 13.5,7.5 10.5,7.5 10.5,13.5 11.59,13.5 " width="3.0" height="3.0" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
-	<circle class="fil1 str0" cx="3" cy="14" r="1.5" width="3.0" height="3.0" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
-	<circle class="fil1 str0" cx="13" cy="14" r="1.5" width="3.0" height="3.0" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
-	<polyline class="fil1 str0" points="1.59,13.5 0.5,13.5 0.5,4.5 10.5,4.5 10.5,13.5 4.41,13.5 " width="3.0" height="3.0" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<polyline class="fil1 str0" points="14.41,13.5 15.5,13.5 15.5,9.5 13.5,7.5 10.5,7.5 10.5,13.5 11.59,13.5 " width="3.0" height="3.0" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<circle class="fil1 str0" cx="3" cy="14" r="1.5" width="3.0" height="3.0" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<circle class="fil1 str0" cx="13" cy="14" r="1.5" width="3.0" height="3.0" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<polyline class="fil1 str0" points="1.59,13.5 0.5,13.5 0.5,4.5 10.5,4.5 10.5,13.5 4.41,13.5 " width="3.0" height="3.0" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-deliver_vgen.go b/icons/l-deliver_vgen.go
index fcc5d38..cdbd848 100644
--- a/icons/l-deliver_vgen.go
+++ b/icons/l-deliver_vgen.go
@@ -31,26 +31,26 @@ func (c *LDeliver) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "polyline", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "fil1 str0"}, vugu.VGAttribute{Namespace: "", Key: "points", Val: "14.41,13.5 15.5,13.5 15.5,9.5 13.5,7.5 10.5,7.5 10.5,13.5 11.59,13.5 "}, vugu.VGAttribute{Namespace: "", Key: "width", Val: "3.0"}, vugu.VGAttribute{Namespace: "", Key: "height", Val: "3.0"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "polyline", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "fil1 str0"}, vugu.VGAttribute{Namespace: "", Key: "points", Val: "14.41,13.5 15.5,13.5 15.5,9.5 13.5,7.5 10.5,7.5 10.5,13.5 11.59,13.5 "}, vugu.VGAttribute{Namespace: "", Key: "width", Val: "3.0"}, vugu.VGAttribute{Namespace: "", Key: "height", Val: "3.0"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "fil1 str0"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "3"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "14"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "1.5"}, vugu.VGAttribute{Namespace: "", Key: "width", Val: "3.0"}, vugu.VGAttribute{Namespace: "", Key: "height", Val: "3.0"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "fil1 str0"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "3"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "14"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "1.5"}, vugu.VGAttribute{Namespace: "", Key: "width", Val: "3.0"}, vugu.VGAttribute{Namespace: "", Key: "height", Val: "3.0"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "fil1 str0"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "13"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "14"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "1.5"}, vugu.VGAttribute{Namespace: "", Key: "width", Val: "3.0"}, vugu.VGAttribute{Namespace: "", Key: "height", Val: "3.0"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "fil1 str0"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "13"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "14"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "1.5"}, vugu.VGAttribute{Namespace: "", Key: "width", Val: "3.0"}, vugu.VGAttribute{Namespace: "", Key: "height", Val: "3.0"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "polyline", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "fil1 str0"}, vugu.VGAttribute{Namespace: "", Key: "points", Val: "1.59,13.5 0.5,13.5 0.5,4.5 10.5,4.5 10.5,13.5 4.41,13.5 "}, vugu.VGAttribute{Namespace: "", Key: "width", Val: "3.0"}, vugu.VGAttribute{Namespace: "", Key: "height", Val: "3.0"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "polyline", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "fil1 str0"}, vugu.VGAttribute{Namespace: "", Key: "points", Val: "1.59,13.5 0.5,13.5 0.5,4.5 10.5,4.5 10.5,13.5 4.41,13.5 "}, vugu.VGAttribute{Namespace: "", Key: "width", Val: "3.0"}, vugu.VGAttribute{Namespace: "", Key: "height", Val: "3.0"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-document-bullet-list.vugu b/icons/l-document-bullet-list.vugu
index d4cecdd..9810041 100644
--- a/icons/l-document-bullet-list.vugu
+++ b/icons/l-document-bullet-list.vugu
@@ -1,14 +1,30 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M6.5 11.5l4 0m-4 -3l5 0m-5 -3l5.01 0m-8.01 -5l9 0c0.55,0 1,0.45 1,1l0 13c0,0.55 -0.45,1 -1,1l-9 0c-0.55,0 -1,-0.45 -1,-1l0 -13c0,-0.55 0.45,-1 1,-1z" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
-	<circle class="d3c-icon-fill" cx="4.5" cy="5.5" r="0.5" fill="black"/>
-	<circle class="d3c-icon-fill" cx="4.5" cy="8.5" r="0.5" fill="black"/>
-	<circle class="d3c-icon-fill" cx="4.5" cy="11.5" r="0.5" fill="black"/>
+	<path class="d3c-icon-stroke" d="M6.5 11.5l4 0m-4 -3l5 0m-5 -3l5.01 0m-8.01 -5l9 0c0.55,0 1,0.45 1,1l0 13c0,0.55 -0.45,1 -1,1l-9 0c-0.55,0 -1,-0.45 -1,-1l0 -13c0,-0.55 0.45,-1 1,-1z" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<circle class="d3c-icon-fill" cx="4.5" cy="5.5" r="0.5" stroke="none"/>
+	<circle class="d3c-icon-fill" cx="4.5" cy="8.5" r="0.5" stroke="none"/>
+	<circle class="d3c-icon-fill" cx="4.5" cy="11.5" r="0.5" stroke="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-document-bullet-list_vgen.go b/icons/l-document-bullet-list_vgen.go
index ee237ba..564bd89 100644
--- a/icons/l-document-bullet-list_vgen.go
+++ b/icons/l-document-bullet-list_vgen.go
@@ -31,26 +31,26 @@ func (c *LDocumentBulletList) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M6.5 11.5l4 0m-4 -3l5 0m-5 -3l5.01 0m-8.01 -5l9 0c0.55,0 1,0.45 1,1l0 13c0,0.55 -0.45,1 -1,1l-9 0c-0.55,0 -1,-0.45 -1,-1l0 -13c0,-0.55 0.45,-1 1,-1z"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M6.5 11.5l4 0m-4 -3l5 0m-5 -3l5.01 0m-8.01 -5l9 0c0.55,0 1,0.45 1,1l0 13c0,0.55 -0.45,1 -1,1l-9 0c-0.55,0 -1,-0.45 -1,-1l0 -13c0,-0.55 0.45,-1 1,-1z"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-fill"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "4.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "5.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "0.5"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "black"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-fill"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "4.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "5.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "0.5"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-fill"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "4.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "8.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "0.5"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "black"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-fill"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "4.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "8.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "0.5"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-fill"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "4.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "11.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "0.5"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "black"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-fill"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "4.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "11.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "0.5"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-document-checkboxes.vugu b/icons/l-document-checkboxes.vugu
index a2ab70d..7f9a899 100644
--- a/icons/l-document-checkboxes.vugu
+++ b/icons/l-document-checkboxes.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M3.5 0.5l9 0c0.55,0 1,0.45 1,1l0 13c0,0.55 -0.45,1 -1,1l-9 0c-0.55,0 -1,-0.45 -1,-1l0 -13c0,-0.55 0.45,-1 1,-1zm1 4l2 0 0 2 -2 0 0 -2zm0 5l2 0 0 2 -2 0 0 -2zm4 -4l3 0m-3 5l3 0" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M3.5 0.5l9 0c0.55,0 1,0.45 1,1l0 13c0,0.55 -0.45,1 -1,1l-9 0c-0.55,0 -1,-0.45 -1,-1l0 -13c0,-0.55 0.45,-1 1,-1zm1 4l2 0 0 2 -2 0 0 -2zm0 5l2 0 0 2 -2 0 0 -2zm4 -4l3 0m-3 5l3 0" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-document-checkboxes_vgen.go b/icons/l-document-checkboxes_vgen.go
index 06e489b..9d13688 100644
--- a/icons/l-document-checkboxes_vgen.go
+++ b/icons/l-document-checkboxes_vgen.go
@@ -31,14 +31,14 @@ func (c *LDocumentCheckboxes) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M3.5 0.5l9 0c0.55,0 1,0.45 1,1l0 13c0,0.55 -0.45,1 -1,1l-9 0c-0.55,0 -1,-0.45 -1,-1l0 -13c0,-0.55 0.45,-1 1,-1zm1 4l2 0 0 2 -2 0 0 -2zm0 5l2 0 0 2 -2 0 0 -2zm4 -4l3 0m-3 5l3 0"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M3.5 0.5l9 0c0.55,0 1,0.45 1,1l0 13c0,0.55 -0.45,1 -1,1l-9 0c-0.55,0 -1,-0.45 -1,-1l0 -13c0,-0.55 0.45,-1 1,-1zm1 4l2 0 0 2 -2 0 0 -2zm0 5l2 0 0 2 -2 0 0 -2zm4 -4l3 0m-3 5l3 0"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-document-rich-text.vugu b/icons/l-document-rich-text.vugu
index 3bb7373..1af9229 100644
--- a/icons/l-document-rich-text.vugu
+++ b/icons/l-document-rich-text.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M3.5 0.5l9 0c0.55,0 1,0.45 1,1l0 13c0,0.55 -0.45,1 -1,1l-9 0c-0.55,0 -1,-0.45 -1,-1l0 -13c0,-0.55 0.45,-1 1,-1zm7.25 5l-1.5 0c-0.41,0 -0.75,-0.34 -0.75,-0.75l0 -1.5c0,-0.41 0.34,-0.75 0.75,-0.75l1.5 0c0.41,0 0.75,0.34 0.75,0.75l0 1.5c0,0.41 -0.34,0.75 -0.75,0.75zm-6.25 0l2 0m-2 3l7 0m-7 3l7 0" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M3.5 0.5l9 0c0.55,0 1,0.45 1,1l0 13c0,0.55 -0.45,1 -1,1l-9 0c-0.55,0 -1,-0.45 -1,-1l0 -13c0,-0.55 0.45,-1 1,-1zm7.25 5l-1.5 0c-0.41,0 -0.75,-0.34 -0.75,-0.75l0 -1.5c0,-0.41 0.34,-0.75 0.75,-0.75l1.5 0c0.41,0 0.75,0.34 0.75,0.75l0 1.5c0,0.41 -0.34,0.75 -0.75,0.75zm-6.25 0l2 0m-2 3l7 0m-7 3l7 0" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-document-rich-text_vgen.go b/icons/l-document-rich-text_vgen.go
index ba83521..0cce4d6 100644
--- a/icons/l-document-rich-text_vgen.go
+++ b/icons/l-document-rich-text_vgen.go
@@ -31,14 +31,14 @@ func (c *LDocumentRichText) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M3.5 0.5l9 0c0.55,0 1,0.45 1,1l0 13c0,0.55 -0.45,1 -1,1l-9 0c-0.55,0 -1,-0.45 -1,-1l0 -13c0,-0.55 0.45,-1 1,-1zm7.25 5l-1.5 0c-0.41,0 -0.75,-0.34 -0.75,-0.75l0 -1.5c0,-0.41 0.34,-0.75 0.75,-0.75l1.5 0c0.41,0 0.75,0.34 0.75,0.75l0 1.5c0,0.41 -0.34,0.75 -0.75,0.75zm-6.25 0l2 0m-2 3l7 0m-7 3l7 0"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M3.5 0.5l9 0c0.55,0 1,0.45 1,1l0 13c0,0.55 -0.45,1 -1,1l-9 0c-0.55,0 -1,-0.45 -1,-1l0 -13c0,-0.55 0.45,-1 1,-1zm7.25 5l-1.5 0c-0.41,0 -0.75,-0.34 -0.75,-0.75l0 -1.5c0,-0.41 0.34,-0.75 0.75,-0.75l1.5 0c0.41,0 0.75,0.34 0.75,0.75l0 1.5c0,0.41 -0.34,0.75 -0.75,0.75zm-6.25 0l2 0m-2 3l7 0m-7 3l7 0"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-document-text.vugu b/icons/l-document-text.vugu
index 51029f6..7ff219c 100644
--- a/icons/l-document-text.vugu
+++ b/icons/l-document-text.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M4.5 11.5l3 0m-3 -3l7 0m-7 -3l7 0m-8.01 -5l9 0c0.55,0 1,0.45 1,1l0 13c0,0.55 -0.45,1 -1,1l-9 0c-0.55,0 -1,-0.45 -1,-1l0 -13c0,-0.55 0.45,-1 1,-1z" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M4.5 11.5l3 0m-3 -3l7 0m-7 -3l7 0m-8.01 -5l9 0c0.55,0 1,0.45 1,1l0 13c0,0.55 -0.45,1 -1,1l-9 0c-0.55,0 -1,-0.45 -1,-1l0 -13c0,-0.55 0.45,-1 1,-1z" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-document-text_vgen.go b/icons/l-document-text_vgen.go
index 2d4818d..3ba68ff 100644
--- a/icons/l-document-text_vgen.go
+++ b/icons/l-document-text_vgen.go
@@ -31,14 +31,14 @@ func (c *LDocumentText) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M4.5 11.5l3 0m-3 -3l7 0m-7 -3l7 0m-8.01 -5l9 0c0.55,0 1,0.45 1,1l0 13c0,0.55 -0.45,1 -1,1l-9 0c-0.55,0 -1,-0.45 -1,-1l0 -13c0,-0.55 0.45,-1 1,-1z"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M4.5 11.5l3 0m-3 -3l7 0m-7 -3l7 0m-8.01 -5l9 0c0.55,0 1,0.45 1,1l0 13c0,0.55 -0.45,1 -1,1l-9 0c-0.55,0 -1,-0.45 -1,-1l0 -13c0,-0.55 0.45,-1 1,-1z"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-document.vugu b/icons/l-document.vugu
index e5feafe..886b586 100644
--- a/icons/l-document.vugu
+++ b/icons/l-document.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M5.5 0.5l7 0c0.55,0 1,0.45 1,1l0 13c0,0.55 -0.45,1 -1,1l-9 0c-0.55,0 -1,-0.45 -1,-1l0 -11 3 -3zm0 0l0 3 -3 0" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M5.5 0.5l7 0c0.55,0 1,0.45 1,1l0 13c0,0.55 -0.45,1 -1,1l-9 0c-0.55,0 -1,-0.45 -1,-1l0 -11 3 -3zm0 0l0 3 -3 0" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-document_vgen.go b/icons/l-document_vgen.go
index f4a3fd7..a7c364a 100644
--- a/icons/l-document_vgen.go
+++ b/icons/l-document_vgen.go
@@ -31,14 +31,14 @@ func (c *LDocument) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M5.5 0.5l7 0c0.55,0 1,0.45 1,1l0 13c0,0.55 -0.45,1 -1,1l-9 0c-0.55,0 -1,-0.45 -1,-1l0 -11 3 -3zm0 0l0 3 -3 0"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M5.5 0.5l7 0c0.55,0 1,0.45 1,1l0 13c0,0.55 -0.45,1 -1,1l-9 0c-0.55,0 -1,-0.45 -1,-1l0 -11 3 -3zm0 0l0 3 -3 0"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-download.vugu b/icons/l-download.vugu
index 7f2a625..1fc673b 100644
--- a/icons/l-download.vugu
+++ b/icons/l-download.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M14.5 10.5l0 4c0,0.47 -0.531,1 -1,1l-12 0c-0.469,0 -1,-0.526 -1,-1l0 -4m4 -2l3 3 3 -3m-3 3l0 -9" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M14.5 10.5l0 4c0,0.47 -0.531,1 -1,1l-12 0c-0.469,0 -1,-0.526 -1,-1l0 -4m4 -2l3 3 3 -3m-3 3l0 -9" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-download_vgen.go b/icons/l-download_vgen.go
index 17a5cf5..a253a98 100644
--- a/icons/l-download_vgen.go
+++ b/icons/l-download_vgen.go
@@ -31,14 +31,14 @@ func (c *LDownload) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M14.5 10.5l0 4c0,0.47 -0.531,1 -1,1l-12 0c-0.469,0 -1,-0.526 -1,-1l0 -4m4 -2l3 3 3 -3m-3 3l0 -9"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M14.5 10.5l0 4c0,0.47 -0.531,1 -1,1l-12 0c-0.469,0 -1,-0.526 -1,-1l0 -4m4 -2l3 3 3 -3m-3 3l0 -9"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-edit.vugu b/icons/l-edit.vugu
index 22861f4..823bd9a 100644
--- a/icons/l-edit.vugu
+++ b/icons/l-edit.vugu
@@ -1,12 +1,28 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M0.5 15.5c0,-1 1,-2 1,-4l10 -10c2,-2 5,1 3,3l-10 10c-2,0 -3,1 -4,1z" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
-	<path class="d3c-icon-stroke" d="M10.5 2.5c1,0 3,2 3,3" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M0.5 15.5c0,-1 1,-2 1,-4l10 -10c2,-2 5,1 3,3l-10 10c-2,0 -3,1 -4,1z" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M10.5 2.5c1,0 3,2 3,3" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-edit_vgen.go b/icons/l-edit_vgen.go
index aabcc74..df1e391 100644
--- a/icons/l-edit_vgen.go
+++ b/icons/l-edit_vgen.go
@@ -31,18 +31,18 @@ func (c *LEdit) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M0.5 15.5c0,-1 1,-2 1,-4l10 -10c2,-2 5,1 3,3l-10 10c-2,0 -3,1 -4,1z"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M0.5 15.5c0,-1 1,-2 1,-4l10 -10c2,-2 5,1 3,3l-10 10c-2,0 -3,1 -4,1z"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M10.5 2.5c1,0 3,2 3,3"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M10.5 2.5c1,0 3,2 3,3"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-error-circle.vugu b/icons/l-error-circle.vugu
index c57cd43..3e907c2 100644
--- a/icons/l-error-circle.vugu
+++ b/icons/l-error-circle.vugu
@@ -1,13 +1,29 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<circle class="d3c-icon-fill" cx="7.49" cy="11.5" r="0.5" fill="black"/>
-	<line class="d3c-icon-stroke" x1="7.49" y1="9.5" x2="7.49" y2= "5.5" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
-	<circle class="d3c-icon-stroke" cx="7.5" cy="8.5" r="7" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<circle class="d3c-icon-fill" cx="7.49" cy="11.5" r="0.5" stroke="none"/>
+	<line class="d3c-icon-stroke" x1="7.49" y1="9.5" x2="7.49" y2= "5.5" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<circle class="d3c-icon-stroke" cx="7.5" cy="8.5" r="7" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-error-circle_vgen.go b/icons/l-error-circle_vgen.go
index ebf7b61..a78cd89 100644
--- a/icons/l-error-circle_vgen.go
+++ b/icons/l-error-circle_vgen.go
@@ -31,22 +31,22 @@ func (c *LErrorCircle) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-fill"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "7.49"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "11.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "0.5"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "black"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-fill"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "7.49"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "11.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "0.5"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "line", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "x1", Val: "7.49"}, vugu.VGAttribute{Namespace: "", Key: "y1", Val: "9.5"}, vugu.VGAttribute{Namespace: "", Key: "x2", Val: "7.49"}, vugu.VGAttribute{Namespace: "", Key: "y2", Val: "5.5"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "line", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "x1", Val: "7.49"}, vugu.VGAttribute{Namespace: "", Key: "y1", Val: "9.5"}, vugu.VGAttribute{Namespace: "", Key: "x2", Val: "7.49"}, vugu.VGAttribute{Namespace: "", Key: "y2", Val: "5.5"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "7.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "8.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "7"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "7.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "8.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "7"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-filter.vugu b/icons/l-filter.vugu
index a780a1a..760b1a6 100644
--- a/icons/l-filter.vugu
+++ b/icons/l-filter.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<polygon class="d3c-icon-stroke" points="9.5,8.5 9.5,15.5 6.5,12.5 6.5,8.5 0.5,2.5 0.5,1.5 15.5,1.5 15.5,2.5" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<polygon class="d3c-icon-stroke" points="9.5,8.5 9.5,15.5 6.5,12.5 6.5,8.5 0.5,2.5 0.5,1.5 15.5,1.5 15.5,2.5" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-filter_vgen.go b/icons/l-filter_vgen.go
index f1599c8..3f2c6ce 100644
--- a/icons/l-filter_vgen.go
+++ b/icons/l-filter_vgen.go
@@ -31,14 +31,14 @@ func (c *LFilter) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "polygon", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "points", Val: "9.5,8.5 9.5,15.5 6.5,12.5 6.5,8.5 0.5,2.5 0.5,1.5 15.5,1.5 15.5,2.5"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "polygon", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "points", Val: "9.5,8.5 9.5,15.5 6.5,12.5 6.5,8.5 0.5,2.5 0.5,1.5 15.5,1.5 15.5,2.5"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-full-screen.vugu b/icons/l-full-screen.vugu
index 0c3bb31..80cae0f 100644
--- a/icons/l-full-screen.vugu
+++ b/icons/l-full-screen.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M0.5 9.5l0 6 6 0m9 -15l-15 15m9 -15l6 0 0 6" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M0.5 9.5l0 6 6 0m9 -15l-15 15m9 -15l6 0 0 6" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-full-screen_vgen.go b/icons/l-full-screen_vgen.go
index 9321dac..efe952d 100644
--- a/icons/l-full-screen_vgen.go
+++ b/icons/l-full-screen_vgen.go
@@ -31,14 +31,14 @@ func (c *LFullScreen) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M0.5 9.5l0 6 6 0m9 -15l-15 15m9 -15l6 0 0 6"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M0.5 9.5l0 6 6 0m9 -15l-15 15m9 -15l6 0 0 6"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-global-nav.vugu b/icons/l-global-nav.vugu
index 0877d95..27cea99 100644
--- a/icons/l-global-nav.vugu
+++ b/icons/l-global-nav.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M0.5 8.5l15 0m-15 5l15 0m-15 -10l15 0" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M0.5 8.5l15 0m-15 5l15 0m-15 -10l15 0" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-global-nav_vgen.go b/icons/l-global-nav_vgen.go
index 1900e12..0b463bf 100644
--- a/icons/l-global-nav_vgen.go
+++ b/icons/l-global-nav_vgen.go
@@ -31,14 +31,14 @@ func (c *LGlobalNav) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M0.5 8.5l15 0m-15 5l15 0m-15 -10l15 0"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M0.5 8.5l15 0m-15 5l15 0m-15 -10l15 0"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-globe.vugu b/icons/l-globe.vugu
index 9153bdf..93daf91 100644
--- a/icons/l-globe.vugu
+++ b/icons/l-globe.vugu
@@ -1,12 +1,28 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<circle class="d3c-icon-stroke" cx="7.5" cy="8.5" r="7" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
-	<path class="d3c-icon-stroke" d="M0.79 6.5l13.42 0m-13.42 4l13.42 0m-6.21 -8.98c3.5,3 3.5,10.96 0,13.96m-1.02 -13.96c-3.5,3 -3.5,10.96 0,13.96" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<circle class="d3c-icon-stroke" cx="7.5" cy="8.5" r="7" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M0.79 6.5l13.42 0m-13.42 4l13.42 0m-6.21 -8.98c3.5,3 3.5,10.96 0,13.96m-1.02 -13.96c-3.5,3 -3.5,10.96 0,13.96" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-globe_vgen.go b/icons/l-globe_vgen.go
index 743d63b..5975ad6 100644
--- a/icons/l-globe_vgen.go
+++ b/icons/l-globe_vgen.go
@@ -31,18 +31,18 @@ func (c *LGlobe) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "7.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "8.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "7"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "7.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "8.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "7"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M0.79 6.5l13.42 0m-13.42 4l13.42 0m-6.21 -8.98c3.5,3 3.5,10.96 0,13.96m-1.02 -13.96c-3.5,3 -3.5,10.96 0,13.96"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M0.79 6.5l13.42 0m-13.42 4l13.42 0m-6.21 -8.98c3.5,3 3.5,10.96 0,13.96m-1.02 -13.96c-3.5,3 -3.5,10.96 0,13.96"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-home.vugu b/icons/l-home.vugu
index 718c815..d7ff36c 100644
--- a/icons/l-home.vugu
+++ b/icons/l-home.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M14.5 15.5l-5 -0 0 -5 -3 0 0 5 -5 0c-0.27,0 -0.51,-0.1 -0.71,-0.29 -0.2,-0.2 -0.29,-0.43 -0.29,-0.71l0 -9 7 -5 1 0 7 5 0 9c0,0.54 -0.46,1 -1,1z" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M14.5 15.5l-5 -0 0 -5 -3 0 0 5 -5 0c-0.27,0 -0.51,-0.1 -0.71,-0.29 -0.2,-0.2 -0.29,-0.43 -0.29,-0.71l0 -9 7 -5 1 0 7 5 0 9c0,0.54 -0.46,1 -1,1z" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-home_vgen.go b/icons/l-home_vgen.go
index a102c44..1a96964 100644
--- a/icons/l-home_vgen.go
+++ b/icons/l-home_vgen.go
@@ -31,14 +31,14 @@ func (c *LHome) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M14.5 15.5l-5 -0 0 -5 -3 0 0 5 -5 0c-0.27,0 -0.51,-0.1 -0.71,-0.29 -0.2,-0.2 -0.29,-0.43 -0.29,-0.71l0 -9 7 -5 1 0 7 5 0 9c0,0.54 -0.46,1 -1,1z"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M14.5 15.5l-5 -0 0 -5 -3 0 0 5 -5 0c-0.27,0 -0.51,-0.1 -0.71,-0.29 -0.2,-0.2 -0.29,-0.43 -0.29,-0.71l0 -9 7 -5 1 0 7 5 0 9c0,0.54 -0.46,1 -1,1z"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-hourglass.vugu b/icons/l-hourglass.vugu
index 2448eac..ab18fbf 100644
--- a/icons/l-hourglass.vugu
+++ b/icons/l-hourglass.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M3.5 0.5l9 0c0.55,0 1,0.45 1,1 0,4.17 -4,4.33 -4,6.5 0,2.17 4,2.33 4,6.5 0,0.55 -0.45,1 -1,1l-9 0c-0.55,0 -1,-0.45 -1,-1 0,-4.16 4,-4.35 4,-6.5 0,-2.18 -4,-2.32 -4,-6.5 0,-0.55 0.45,-1 1,-1z" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M3.5 0.5l9 0c0.55,0 1,0.45 1,1 0,4.17 -4,4.33 -4,6.5 0,2.17 4,2.33 4,6.5 0,0.55 -0.45,1 -1,1l-9 0c-0.55,0 -1,-0.45 -1,-1 0,-4.16 4,-4.35 4,-6.5 0,-2.18 -4,-2.32 -4,-6.5 0,-0.55 0.45,-1 1,-1z" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-hourglass_vgen.go b/icons/l-hourglass_vgen.go
index 9244ffb..ab6fab3 100644
--- a/icons/l-hourglass_vgen.go
+++ b/icons/l-hourglass_vgen.go
@@ -31,14 +31,14 @@ func (c *LHourglass) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M3.5 0.5l9 0c0.55,0 1,0.45 1,1 0,4.17 -4,4.33 -4,6.5 0,2.17 4,2.33 4,6.5 0,0.55 -0.45,1 -1,1l-9 0c-0.55,0 -1,-0.45 -1,-1 0,-4.16 4,-4.35 4,-6.5 0,-2.18 -4,-2.32 -4,-6.5 0,-0.55 0.45,-1 1,-1z"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M3.5 0.5l9 0c0.55,0 1,0.45 1,1 0,4.17 -4,4.33 -4,6.5 0,2.17 4,2.33 4,6.5 0,0.55 -0.45,1 -1,1l-9 0c-0.55,0 -1,-0.45 -1,-1 0,-4.16 4,-4.35 4,-6.5 0,-2.18 -4,-2.32 -4,-6.5 0,-0.55 0.45,-1 1,-1z"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-info-circle.vugu b/icons/l-info-circle.vugu
index 3d92daa..3aa413f 100644
--- a/icons/l-info-circle.vugu
+++ b/icons/l-info-circle.vugu
@@ -1,13 +1,29 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<line class="d3c-icon-stroke" x1="7.5" y1="11.5" x2="7.5" y2= "7.5" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
-	<circle class="d3c-icon-fill" cx="7.5" cy="5.5" r="0.5" fill="black"/>
-	<circle class="d3c-icon-stroke" cx="7.5" cy="8.5" r="7" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<line class="d3c-icon-stroke" x1="7.5" y1="11.5" x2="7.5" y2= "7.5" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<circle class="d3c-icon-fill" cx="7.5" cy="5.5" r="0.5" stroke="none"/>
+	<circle class="d3c-icon-stroke" cx="7.5" cy="8.5" r="7" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-info-circle_vgen.go b/icons/l-info-circle_vgen.go
index 16e5071..6cf0473 100644
--- a/icons/l-info-circle_vgen.go
+++ b/icons/l-info-circle_vgen.go
@@ -31,22 +31,22 @@ func (c *LInfoCircle) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "line", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "x1", Val: "7.5"}, vugu.VGAttribute{Namespace: "", Key: "y1", Val: "11.5"}, vugu.VGAttribute{Namespace: "", Key: "x2", Val: "7.5"}, vugu.VGAttribute{Namespace: "", Key: "y2", Val: "7.5"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "line", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "x1", Val: "7.5"}, vugu.VGAttribute{Namespace: "", Key: "y1", Val: "11.5"}, vugu.VGAttribute{Namespace: "", Key: "x2", Val: "7.5"}, vugu.VGAttribute{Namespace: "", Key: "y2", Val: "7.5"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-fill"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "7.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "5.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "0.5"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "black"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-fill"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "7.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "5.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "0.5"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "7.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "8.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "7"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "7.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "8.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "7"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-lock-closed.vugu b/icons/l-lock-closed.vugu
index 32c5a00..10b243a 100644
--- a/icons/l-lock-closed.vugu
+++ b/icons/l-lock-closed.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M3.5 15.5l9 0c0.55,0 1,-0.45 1,-1l0 -5c0,-0.55 -0.452,-1 -1,-1l-9 0c-0.549,0 -1,0.452 -1,1l0 5c0,0.548 0.45,1 1,1zm1 -7l0 -4.5c0,-1.933 1.567,-3.5 3.5,-3.5 1.933,0 3.5,1.567 3.5,3.5l0 4.5" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M3.5 15.5l9 0c0.55,0 1,-0.45 1,-1l0 -5c0,-0.55 -0.452,-1 -1,-1l-9 0c-0.549,0 -1,0.452 -1,1l0 5c0,0.548 0.45,1 1,1zm1 -7l0 -4.5c0,-1.933 1.567,-3.5 3.5,-3.5 1.933,0 3.5,1.567 3.5,3.5l0 4.5" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-lock-closed_vgen.go b/icons/l-lock-closed_vgen.go
index b5872d8..e93864f 100644
--- a/icons/l-lock-closed_vgen.go
+++ b/icons/l-lock-closed_vgen.go
@@ -31,14 +31,14 @@ func (c *LLockClosed) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M3.5 15.5l9 0c0.55,0 1,-0.45 1,-1l0 -5c0,-0.55 -0.452,-1 -1,-1l-9 0c-0.549,0 -1,0.452 -1,1l0 5c0,0.548 0.45,1 1,1zm1 -7l0 -4.5c0,-1.933 1.567,-3.5 3.5,-3.5 1.933,0 3.5,1.567 3.5,3.5l0 4.5"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M3.5 15.5l9 0c0.55,0 1,-0.45 1,-1l0 -5c0,-0.55 -0.452,-1 -1,-1l-9 0c-0.549,0 -1,0.452 -1,1l0 5c0,0.548 0.45,1 1,1zm1 -7l0 -4.5c0,-1.933 1.567,-3.5 3.5,-3.5 1.933,0 3.5,1.567 3.5,3.5l0 4.5"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-lock-disabled.vugu b/icons/l-lock-disabled.vugu
index 2fc039c..899beea 100644
--- a/icons/l-lock-disabled.vugu
+++ b/icons/l-lock-disabled.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M7.5 8.5l-3.987 0c-0.548,0 -1,0.453 -1,1l0 5c0,0.548 0.45,1 1,1l9 0c0.55,0 1,-0.45 1,-1m0 -2.485l0 -2.515c0,-0.55 -0.457,-1 -1,-1l-2.516 0m-5.484 0l0 -2.932m0.114 -2.458c0.394,-1.5 1.761,-2.61 3.386,-2.61 1.933,0 3.5,1.567 3.5,3.5l0 4.5m-11.013 -7l14 14" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M7.5 8.5l-3.987 0c-0.548,0 -1,0.453 -1,1l0 5c0,0.548 0.45,1 1,1l9 0c0.55,0 1,-0.45 1,-1m0 -2.485l0 -2.515c0,-0.55 -0.457,-1 -1,-1l-2.516 0m-5.484 0l0 -2.932m0.114 -2.458c0.394,-1.5 1.761,-2.61 3.386,-2.61 1.933,0 3.5,1.567 3.5,3.5l0 4.5m-11.013 -7l14 14" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-lock-disabled_vgen.go b/icons/l-lock-disabled_vgen.go
index f948caa..b4ff19a 100644
--- a/icons/l-lock-disabled_vgen.go
+++ b/icons/l-lock-disabled_vgen.go
@@ -31,14 +31,14 @@ func (c *LLockDisabled) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M7.5 8.5l-3.987 0c-0.548,0 -1,0.453 -1,1l0 5c0,0.548 0.45,1 1,1l9 0c0.55,0 1,-0.45 1,-1m0 -2.485l0 -2.515c0,-0.55 -0.457,-1 -1,-1l-2.516 0m-5.484 0l0 -2.932m0.114 -2.458c0.394,-1.5 1.761,-2.61 3.386,-2.61 1.933,0 3.5,1.567 3.5,3.5l0 4.5m-11.013 -7l14 14"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M7.5 8.5l-3.987 0c-0.548,0 -1,0.453 -1,1l0 5c0,0.548 0.45,1 1,1l9 0c0.55,0 1,-0.45 1,-1m0 -2.485l0 -2.515c0,-0.55 -0.457,-1 -1,-1l-2.516 0m-5.484 0l0 -2.932m0.114 -2.458c0.394,-1.5 1.761,-2.61 3.386,-2.61 1.933,0 3.5,1.567 3.5,3.5l0 4.5m-11.013 -7l14 14"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-lock-opened.vugu b/icons/l-lock-opened.vugu
index 89f6452..bee5001 100644
--- a/icons/l-lock-opened.vugu
+++ b/icons/l-lock-opened.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M3.5 15.5l9 0c0.55,0 1,-0.45 1,-1l0 -5c0,-0.55 -0.452,-1 -1,-1l-9 0c-0.549,0 -1,0.452 -1,1l0 5c0,0.548 0.45,1 1,1zm1 -7l0 -4.5c0,-1.933 1.567,-3.5 3.5,-3.5 1.933,0 3.5,1.567 3.5,3.5" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M3.5 15.5l9 0c0.55,0 1,-0.45 1,-1l0 -5c0,-0.55 -0.452,-1 -1,-1l-9 0c-0.549,0 -1,0.452 -1,1l0 5c0,0.548 0.45,1 1,1zm1 -7l0 -4.5c0,-1.933 1.567,-3.5 3.5,-3.5 1.933,0 3.5,1.567 3.5,3.5" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-lock-opened_vgen.go b/icons/l-lock-opened_vgen.go
index a4dfc07..a7193cf 100644
--- a/icons/l-lock-opened_vgen.go
+++ b/icons/l-lock-opened_vgen.go
@@ -31,14 +31,14 @@ func (c *LLockOpened) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M3.5 15.5l9 0c0.55,0 1,-0.45 1,-1l0 -5c0,-0.55 -0.452,-1 -1,-1l-9 0c-0.549,0 -1,0.452 -1,1l0 5c0,0.548 0.45,1 1,1zm1 -7l0 -4.5c0,-1.933 1.567,-3.5 3.5,-3.5 1.933,0 3.5,1.567 3.5,3.5"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M3.5 15.5l9 0c0.55,0 1,-0.45 1,-1l0 -5c0,-0.55 -0.452,-1 -1,-1l-9 0c-0.549,0 -1,0.452 -1,1l0 5c0,0.548 0.45,1 1,1zm1 -7l0 -4.5c0,-1.933 1.567,-3.5 3.5,-3.5 1.933,0 3.5,1.567 3.5,3.5"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-mail-opened.vugu b/icons/l-mail-opened.vugu
index 455d79f..1d36d7b 100644
--- a/icons/l-mail-opened.vugu
+++ b/icons/l-mail-opened.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M0.5 6.5l3 2 9 0 3 -2m0 -1l-6.21 -3.73c-0.81,-0.49 -1.76,-0.49 -2.57,0l-6.21 3.73 0 9 15 0 0 -9z" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M0.5 6.5l3 2 9 0 3 -2m0 -1l-6.21 -3.73c-0.81,-0.49 -1.76,-0.49 -2.57,0l-6.21 3.73 0 9 15 0 0 -9z" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-mail-opened_vgen.go b/icons/l-mail-opened_vgen.go
index 967d8af..fa95a96 100644
--- a/icons/l-mail-opened_vgen.go
+++ b/icons/l-mail-opened_vgen.go
@@ -31,14 +31,14 @@ func (c *LMailOpened) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M0.5 6.5l3 2 9 0 3 -2m0 -1l-6.21 -3.73c-0.81,-0.49 -1.76,-0.49 -2.57,0l-6.21 3.73 0 9 15 0 0 -9z"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M0.5 6.5l3 2 9 0 3 -2m0 -1l-6.21 -3.73c-0.81,-0.49 -1.76,-0.49 -2.57,0l-6.21 3.73 0 9 15 0 0 -9z"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-mail.vugu b/icons/l-mail.vugu
index baf5e2d..7f81baf 100644
--- a/icons/l-mail.vugu
+++ b/icons/l-mail.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M0.5 4.5l6.21 3.73c0.81,0.49 1.76,0.49 2.57,0l6.21 -3.73m0 -1l-15 0 0 10 15 0 0 -10z" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M0.5 4.5l6.21 3.73c0.81,0.49 1.76,0.49 2.57,0l6.21 -3.73m0 -1l-15 0 0 10 15 0 0 -10z" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-mail_vgen.go b/icons/l-mail_vgen.go
index 85da8eb..de35283 100644
--- a/icons/l-mail_vgen.go
+++ b/icons/l-mail_vgen.go
@@ -31,14 +31,14 @@ func (c *LMail) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M0.5 4.5l6.21 3.73c0.81,0.49 1.76,0.49 2.57,0l6.21 -3.73m0 -1l-15 0 0 10 15 0 0 -10z"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M0.5 4.5l6.21 3.73c0.81,0.49 1.76,0.49 2.57,0l6.21 -3.73m0 -1l-15 0 0 10 15 0 0 -10z"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-minus.vugu b/icons/l-minus.vugu
index 93798a5..464ef54 100644
--- a/icons/l-minus.vugu
+++ b/icons/l-minus.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M1.5 8.5l12 0" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M1.5 8.5l12 0" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-minus_vgen.go b/icons/l-minus_vgen.go
index d7cb8b9..7816315 100644
--- a/icons/l-minus_vgen.go
+++ b/icons/l-minus_vgen.go
@@ -31,14 +31,14 @@ func (c *LMinus) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M1.5 8.5l12 0"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M1.5 8.5l12 0"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-more.vugu b/icons/l-more.vugu
index d2c1f5e..70bce5f 100644
--- a/icons/l-more.vugu
+++ b/icons/l-more.vugu
@@ -1,13 +1,29 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<circle class="d3c-icon-fill" cx="1.5" cy="8.5" r="1" stroke="none" fill="black"/>
-	<circle class="d3c-icon-fill" cx="7.5" cy="8.5" r="1" stroke="none" fill="black"/>
-	<circle class="d3c-icon-fill" cx="13.5" cy="8.5" r="1" stroke="none" fill="black"/>
+	<circle class="d3c-icon-fill" cx="1.5" cy="8.5" r="1" stroke="none"/>
+	<circle class="d3c-icon-fill" cx="7.5" cy="8.5" r="1" stroke="none"/>
+	<circle class="d3c-icon-fill" cx="13.5" cy="8.5" r="1" stroke="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-more_vgen.go b/icons/l-more_vgen.go
index 574b8dc..dd1cbdc 100644
--- a/icons/l-more_vgen.go
+++ b/icons/l-more_vgen.go
@@ -31,22 +31,22 @@ func (c *LMore) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-fill"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "1.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "8.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "none"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "black"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-fill"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "1.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "8.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-fill"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "7.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "8.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "none"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "black"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-fill"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "7.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "8.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-fill"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "13.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "8.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "none"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "black"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-fill"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "13.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "8.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-paste.vugu b/icons/l-paste.vugu
index 3c5b37c..6e2f0bf 100644
--- a/icons/l-paste.vugu
+++ b/icons/l-paste.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M9.525 1.5l2 0c0.55,0 1,0.453 1,1l0 1m-7 12l-3 -0c-0.546,-0 -1,-0.45 -1,-1l0 -12c0,-0.551 0.45,-1 1,-1l2.011 -0m1 -1l3 0c0.551,0 1,0.45 1,1 0,0.551 -0.45,1 -1,1l-3 0c-0.551,0 -1,-0.45 -1,-1 0,-0.55 0.449,-1 1,-1zm2.988 5l5 0c0.55,0 1,0.453 1,1l0 7.998c0,0.547 -0.452,1 -1,1l-5 0c-0.547,0 -1,-0.45 -1,-1l0 -7.998c0,-0.55 0.449,-1 1,-1z" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M9.525 1.5l2 0c0.55,0 1,0.453 1,1l0 1m-7 12l-3 -0c-0.546,-0 -1,-0.45 -1,-1l0 -12c0,-0.551 0.45,-1 1,-1l2.011 -0m1 -1l3 0c0.551,0 1,0.45 1,1 0,0.551 -0.45,1 -1,1l-3 0c-0.551,0 -1,-0.45 -1,-1 0,-0.55 0.449,-1 1,-1zm2.988 5l5 0c0.55,0 1,0.453 1,1l0 7.998c0,0.547 -0.452,1 -1,1l-5 0c-0.547,0 -1,-0.45 -1,-1l0 -7.998c0,-0.55 0.449,-1 1,-1z" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-paste_vgen.go b/icons/l-paste_vgen.go
index bd37650..e030034 100644
--- a/icons/l-paste_vgen.go
+++ b/icons/l-paste_vgen.go
@@ -31,14 +31,14 @@ func (c *LPaste) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M9.525 1.5l2 0c0.55,0 1,0.453 1,1l0 1m-7 12l-3 -0c-0.546,-0 -1,-0.45 -1,-1l0 -12c0,-0.551 0.45,-1 1,-1l2.011 -0m1 -1l3 0c0.551,0 1,0.45 1,1 0,0.551 -0.45,1 -1,1l-3 0c-0.551,0 -1,-0.45 -1,-1 0,-0.55 0.449,-1 1,-1zm2.988 5l5 0c0.55,0 1,0.453 1,1l0 7.998c0,0.547 -0.452,1 -1,1l-5 0c-0.547,0 -1,-0.45 -1,-1l0 -7.998c0,-0.55 0.449,-1 1,-1z"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M9.525 1.5l2 0c0.55,0 1,0.453 1,1l0 1m-7 12l-3 -0c-0.546,-0 -1,-0.45 -1,-1l0 -12c0,-0.551 0.45,-1 1,-1l2.011 -0m1 -1l3 0c0.551,0 1,0.45 1,1 0,0.551 -0.45,1 -1,1l-3 0c-0.551,0 -1,-0.45 -1,-1 0,-0.55 0.449,-1 1,-1zm2.988 5l5 0c0.55,0 1,0.453 1,1l0 7.998c0,0.547 -0.452,1 -1,1l-5 0c-0.547,0 -1,-0.45 -1,-1l0 -7.998c0,-0.55 0.449,-1 1,-1z"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-pause.vugu b/icons/l-pause.vugu
index 9055415..5192414 100644
--- a/icons/l-pause.vugu
+++ b/icons/l-pause.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M3.98 2.5l1.01 0c0.83,0 1.5,0.68 1.5,1.5l0 8c0,0.82 -0.68,1.5 -1.5,1.5l-1.01 0c-0.82,0 -1.5,-0.67 -1.5,-1.5l0 -8c0,-0.83 0.68,-1.5 1.5,-1.5zm6.99 0l1.01 0c0.83,0 1.5,0.68 1.5,1.5l0 8c0,0.82 -0.68,1.5 -1.5,1.5l-1.01 0c-0.83,0 -1.5,-0.67 -1.5,-1.5l0 -8c0,-0.83 0.67,-1.5 1.5,-1.5z" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M3.98 2.5l1.01 0c0.83,0 1.5,0.68 1.5,1.5l0 8c0,0.82 -0.68,1.5 -1.5,1.5l-1.01 0c-0.82,0 -1.5,-0.67 -1.5,-1.5l0 -8c0,-0.83 0.68,-1.5 1.5,-1.5zm6.99 0l1.01 0c0.83,0 1.5,0.68 1.5,1.5l0 8c0,0.82 -0.68,1.5 -1.5,1.5l-1.01 0c-0.83,0 -1.5,-0.67 -1.5,-1.5l0 -8c0,-0.83 0.67,-1.5 1.5,-1.5z" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-pause_vgen.go b/icons/l-pause_vgen.go
index 21056b9..f2ccdf2 100644
--- a/icons/l-pause_vgen.go
+++ b/icons/l-pause_vgen.go
@@ -31,14 +31,14 @@ func (c *LPause) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M3.98 2.5l1.01 0c0.83,0 1.5,0.68 1.5,1.5l0 8c0,0.82 -0.68,1.5 -1.5,1.5l-1.01 0c-0.82,0 -1.5,-0.67 -1.5,-1.5l0 -8c0,-0.83 0.68,-1.5 1.5,-1.5zm6.99 0l1.01 0c0.83,0 1.5,0.68 1.5,1.5l0 8c0,0.82 -0.68,1.5 -1.5,1.5l-1.01 0c-0.83,0 -1.5,-0.67 -1.5,-1.5l0 -8c0,-0.83 0.67,-1.5 1.5,-1.5z"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M3.98 2.5l1.01 0c0.83,0 1.5,0.68 1.5,1.5l0 8c0,0.82 -0.68,1.5 -1.5,1.5l-1.01 0c-0.82,0 -1.5,-0.67 -1.5,-1.5l0 -8c0,-0.83 0.68,-1.5 1.5,-1.5zm6.99 0l1.01 0c0.83,0 1.5,0.68 1.5,1.5l0 8c0,0.82 -0.68,1.5 -1.5,1.5l-1.01 0c-0.83,0 -1.5,-0.67 -1.5,-1.5l0 -8c0,-0.83 0.67,-1.5 1.5,-1.5z"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-plus.vugu b/icons/l-plus.vugu
index a712ca5..cd372e7 100644
--- a/icons/l-plus.vugu
+++ b/icons/l-plus.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M1.5 8.5l12 0m-6 -6l0 12" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M1.5 8.5l12 0m-6 -6l0 12" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-plus_vgen.go b/icons/l-plus_vgen.go
index be3463f..f90d407 100644
--- a/icons/l-plus_vgen.go
+++ b/icons/l-plus_vgen.go
@@ -31,14 +31,14 @@ func (c *LPlus) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M1.5 8.5l12 0m-6 -6l0 12"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M1.5 8.5l12 0m-6 -6l0 12"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-power-button.vugu b/icons/l-power-button.vugu
index 5359b63..eecd826 100644
--- a/icons/l-power-button.vugu
+++ b/icons/l-power-button.vugu
@@ -1,12 +1,28 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<line class="d3c-icon-stroke" x1="7.485" y1="0.5" x2="7.485" y2= "7.5" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
-	<path class="d3c-icon-stroke" d="M4.545 2.157c-2.466,1.15 -4.042,3.624 -4.042,6.344 0,3.866 3.134,7 7,7 3.866,0 7,-3.134 7,-7 0,-2.72 -1.576,-5.194 -4.042,-6.344" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<line class="d3c-icon-stroke" x1="7.485" y1="0.5" x2="7.485" y2= "7.5" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M4.545 2.157c-2.466,1.15 -4.042,3.624 -4.042,6.344 0,3.866 3.134,7 7,7 3.866,0 7,-3.134 7,-7 0,-2.72 -1.576,-5.194 -4.042,-6.344" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-power-button_vgen.go b/icons/l-power-button_vgen.go
index d01d2ca..a029150 100644
--- a/icons/l-power-button_vgen.go
+++ b/icons/l-power-button_vgen.go
@@ -31,18 +31,18 @@ func (c *LPowerButton) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "line", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "x1", Val: "7.485"}, vugu.VGAttribute{Namespace: "", Key: "y1", Val: "0.5"}, vugu.VGAttribute{Namespace: "", Key: "x2", Val: "7.485"}, vugu.VGAttribute{Namespace: "", Key: "y2", Val: "7.5"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "line", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "x1", Val: "7.485"}, vugu.VGAttribute{Namespace: "", Key: "y1", Val: "0.5"}, vugu.VGAttribute{Namespace: "", Key: "x2", Val: "7.485"}, vugu.VGAttribute{Namespace: "", Key: "y2", Val: "7.5"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M4.545 2.157c-2.466,1.15 -4.042,3.624 -4.042,6.344 0,3.866 3.134,7 7,7 3.866,0 7,-3.134 7,-7 0,-2.72 -1.576,-5.194 -4.042,-6.344"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M4.545 2.157c-2.466,1.15 -4.042,3.624 -4.042,6.344 0,3.866 3.134,7 7,7 3.866,0 7,-3.134 7,-7 0,-2.72 -1.576,-5.194 -4.042,-6.344"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-redo.vugu b/icons/l-redo.vugu
index c0f4b40..d7f14f3 100644
--- a/icons/l-redo.vugu
+++ b/icons/l-redo.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M8.372 15.498l-5.501 -5.501c-1.951,-1.951 -1.951,-5.115 0.001,-7.066 1.951,-1.951 5.114,-1.952 7.066,0l3.574 3.569m0 -4.242l0 4.242 -4.242 0" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M8.372 15.498l-5.501 -5.501c-1.951,-1.951 -1.951,-5.115 0.001,-7.066 1.951,-1.951 5.114,-1.952 7.066,0l3.574 3.569m0 -4.242l0 4.242 -4.242 0" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-redo_vgen.go b/icons/l-redo_vgen.go
index dec2679..35079bb 100644
--- a/icons/l-redo_vgen.go
+++ b/icons/l-redo_vgen.go
@@ -31,14 +31,14 @@ func (c *LRedo) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M8.372 15.498l-5.501 -5.501c-1.951,-1.951 -1.951,-5.115 0.001,-7.066 1.951,-1.951 5.114,-1.952 7.066,0l3.574 3.569m0 -4.242l0 4.242 -4.242 0"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M8.372 15.498l-5.501 -5.501c-1.951,-1.951 -1.951,-5.115 0.001,-7.066 1.951,-1.951 5.114,-1.952 7.066,0l3.574 3.569m0 -4.242l0 4.242 -4.242 0"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-reload.vugu b/icons/l-reload.vugu
index db74a0e..0b31fd0 100644
--- a/icons/l-reload.vugu
+++ b/icons/l-reload.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M13.517 1.746l0 3.754 -3.753 0m3.753 0c-1.496,-2.139 -3.23,-3.986 -6.015,-3.986 -3.857,0 -6.985,3.127 -6.985,6.985 0,3.858 3.128,6.986 6.985,6.986 3.858,0 6.986,-3.128 6.986,-6.986" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M13.517 1.746l0 3.754 -3.753 0m3.753 0c-1.496,-2.139 -3.23,-3.986 -6.015,-3.986 -3.857,0 -6.985,3.127 -6.985,6.985 0,3.858 3.128,6.986 6.985,6.986 3.858,0 6.986,-3.128 6.986,-6.986" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-reload_vgen.go b/icons/l-reload_vgen.go
index b47e673..3c1bdd3 100644
--- a/icons/l-reload_vgen.go
+++ b/icons/l-reload_vgen.go
@@ -31,14 +31,14 @@ func (c *LReload) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M13.517 1.746l0 3.754 -3.753 0m3.753 0c-1.496,-2.139 -3.23,-3.986 -6.015,-3.986 -3.857,0 -6.985,3.127 -6.985,6.985 0,3.858 3.128,6.986 6.985,6.986 3.858,0 6.986,-3.128 6.986,-6.986"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M13.517 1.746l0 3.754 -3.753 0m3.753 0c-1.496,-2.139 -3.23,-3.986 -6.015,-3.986 -3.857,0 -6.985,3.127 -6.985,6.985 0,3.858 3.128,6.986 6.985,6.986 3.858,0 6.986,-3.128 6.986,-6.986"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-save.vugu b/icons/l-save.vugu
index 8bf708a..290fd7e 100644
--- a/icons/l-save.vugu
+++ b/icons/l-save.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M1.488 14.5l0 -12 1 -1 9 0 3 3 0 10 -1 1 -10.999 0 -1 -1zm3 -13l0 4 5 0 0 -4m-6 14l0 -7 9 0 0 7" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M1.488 14.5l0 -12 1 -1 9 0 3 3 0 10 -1 1 -10.999 0 -1 -1zm3 -13l0 4 5 0 0 -4m-6 14l0 -7 9 0 0 7" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-save_vgen.go b/icons/l-save_vgen.go
index aad0e5f..f69f40a 100644
--- a/icons/l-save_vgen.go
+++ b/icons/l-save_vgen.go
@@ -31,14 +31,14 @@ func (c *LSave) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M1.488 14.5l0 -12 1 -1 9 0 3 3 0 10 -1 1 -10.999 0 -1 -1zm3 -13l0 4 5 0 0 -4m-6 14l0 -7 9 0 0 7"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M1.488 14.5l0 -12 1 -1 9 0 3 3 0 10 -1 1 -10.999 0 -1 -1zm3 -13l0 4 5 0 0 -4m-6 14l0 -7 9 0 0 7"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-search.vugu b/icons/l-search.vugu
index 79564a5..8b5b4bf 100644
--- a/icons/l-search.vugu
+++ b/icons/l-search.vugu
@@ -1,12 +1,28 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<line class="d3c-icon-stroke" x1="0.5" y1="15.5" x2="5.956" y2= "10.037" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
-	<circle class="d3c-icon-stroke" cx="9.5" cy="6.5" r="5" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<line class="d3c-icon-stroke" x1="0.5" y1="15.5" x2="5.956" y2= "10.037" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<circle class="d3c-icon-stroke" cx="9.5" cy="6.5" r="5" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-search_vgen.go b/icons/l-search_vgen.go
index f8587b0..5cf4603 100644
--- a/icons/l-search_vgen.go
+++ b/icons/l-search_vgen.go
@@ -31,18 +31,18 @@ func (c *LSearch) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "line", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "x1", Val: "0.5"}, vugu.VGAttribute{Namespace: "", Key: "y1", Val: "15.5"}, vugu.VGAttribute{Namespace: "", Key: "x2", Val: "5.956"}, vugu.VGAttribute{Namespace: "", Key: "y2", Val: "10.037"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "line", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "x1", Val: "0.5"}, vugu.VGAttribute{Namespace: "", Key: "y1", Val: "15.5"}, vugu.VGAttribute{Namespace: "", Key: "x2", Val: "5.956"}, vugu.VGAttribute{Namespace: "", Key: "y2", Val: "10.037"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "9.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "6.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "5"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "9.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "6.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "5"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-settings.vugu b/icons/l-settings.vugu
index 58f44ad..877ee55 100644
--- a/icons/l-settings.vugu
+++ b/icons/l-settings.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M8.001 10.504c1.384,0 2.503,-1.119 2.503,-2.503 0,-1.384 -1.119,-2.503 -2.503,-2.503 -1.384,0 -2.503,1.119 -2.503,2.503 0,1.384 1.119,2.503 2.503,2.503zm-5.332 -1.157c-0.218,-0.87 -0.225,-1.797 0,-2.693l-1.784 -1.03c0.157,-0.468 0.362,-0.929 0.62,-1.374 0.256,-0.444 0.552,-0.853 0.88,-1.224l1.784 1.031c0.645,-0.625 1.444,-1.095 2.332,-1.346l0 -2.061c0.484,-0.098 0.986,-0.15 1.5,-0.15 0.514,0 1.016,0.052 1.5,0.15l0.001 2.063c0.863,0.246 1.668,0.7 2.33,1.344l1.785 -1.031c0.327,0.371 0.624,0.78 0.88,1.225 0.257,0.444 0.463,0.905 0.62,1.373l-1.786 1.033c0.219,0.87 0.227,1.795 0.001,2.69l1.785 1.03c-0.157,0.469 -0.363,0.93 -0.62,1.375 -0.256,0.444 -0.553,0.853 -0.88,1.224l-1.787 -1.032c-0.645,0.625 -1.441,1.095 -2.329,1.347l0 2.061c-0.484,0.098 -0.986,0.15 -1.5,0.15 -0.514,0 -1.016,-0.052 -1.5,-0.15l-0.001 -2.063c-0.864,-0.246 -1.668,-0.701 -2.331,-1.345l-1.784 1.032c-0.328,-0.371 -0.624,-0.78 -0.88,-1.225 -0.258,-0.444 -0.463,-0.905 -0.62,-1.374l1.784 -1.03z" stroke="black" stroke-width="1" stroke-linejoin="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M8.001 10.504c1.384,0 2.503,-1.119 2.503,-2.503 0,-1.384 -1.119,-2.503 -2.503,-2.503 -1.384,0 -2.503,1.119 -2.503,2.503 0,1.384 1.119,2.503 2.503,2.503zm-5.332 -1.157c-0.218,-0.87 -0.225,-1.797 0,-2.693l-1.784 -1.03c0.157,-0.468 0.362,-0.929 0.62,-1.374 0.256,-0.444 0.552,-0.853 0.88,-1.224l1.784 1.031c0.645,-0.625 1.444,-1.095 2.332,-1.346l0 -2.061c0.484,-0.098 0.986,-0.15 1.5,-0.15 0.514,0 1.016,0.052 1.5,0.15l0.001 2.063c0.863,0.246 1.668,0.7 2.33,1.344l1.785 -1.031c0.327,0.371 0.624,0.78 0.88,1.225 0.257,0.444 0.463,0.905 0.62,1.373l-1.786 1.033c0.219,0.87 0.227,1.795 0.001,2.69l1.785 1.03c-0.157,0.469 -0.363,0.93 -0.62,1.375 -0.256,0.444 -0.553,0.853 -0.88,1.224l-1.787 -1.032c-0.645,0.625 -1.441,1.095 -2.329,1.347l0 2.061c-0.484,0.098 -0.986,0.15 -1.5,0.15 -0.514,0 -1.016,-0.052 -1.5,-0.15l-0.001 -2.063c-0.864,-0.246 -1.668,-0.701 -2.331,-1.345l-1.784 1.032c-0.328,-0.371 -0.624,-0.78 -0.88,-1.225 -0.258,-0.444 -0.463,-0.905 -0.62,-1.374l1.784 -1.03z" stroke-width="1" stroke-linejoin="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-settings_vgen.go b/icons/l-settings_vgen.go
index c90bad4..54ce543 100644
--- a/icons/l-settings_vgen.go
+++ b/icons/l-settings_vgen.go
@@ -31,14 +31,14 @@ func (c *LSettings) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M8.001 10.504c1.384,0 2.503,-1.119 2.503,-2.503 0,-1.384 -1.119,-2.503 -2.503,-2.503 -1.384,0 -2.503,1.119 -2.503,2.503 0,1.384 1.119,2.503 2.503,2.503zm-5.332 -1.157c-0.218,-0.87 -0.225,-1.797 0,-2.693l-1.784 -1.03c0.157,-0.468 0.362,-0.929 0.62,-1.374 0.256,-0.444 0.552,-0.853 0.88,-1.224l1.784 1.031c0.645,-0.625 1.444,-1.095 2.332,-1.346l0 -2.061c0.484,-0.098 0.986,-0.15 1.5,-0.15 0.514,0 1.016,0.052 1.5,0.15l0.001 2.063c0.863,0.246 1.668,0.7 2.33,1.344l1.785 -1.031c0.327,0.371 0.624,0.78 0.88,1.225 0.257,0.444 0.463,0.905 0.62,1.373l-1.786 1.033c0.219,0.87 0.227,1.795 0.001,2.69l1.785 1.03c-0.157,0.469 -0.363,0.93 -0.62,1.375 -0.256,0.444 -0.553,0.853 -0.88,1.224l-1.787 -1.032c-0.645,0.625 -1.441,1.095 -2.329,1.347l0 2.061c-0.484,0.098 -0.986,0.15 -1.5,0.15 -0.514,0 -1.016,-0.052 -1.5,-0.15l-0.001 -2.063c-0.864,-0.246 -1.668,-0.701 -2.331,-1.345l-1.784 1.032c-0.328,-0.371 -0.624,-0.78 -0.88,-1.225 -0.258,-0.444 -0.463,-0.905 -0.62,-1.374l1.784 -1.03z"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M8.001 10.504c1.384,0 2.503,-1.119 2.503,-2.503 0,-1.384 -1.119,-2.503 -2.503,-2.503 -1.384,0 -2.503,1.119 -2.503,2.503 0,1.384 1.119,2.503 2.503,2.503zm-5.332 -1.157c-0.218,-0.87 -0.225,-1.797 0,-2.693l-1.784 -1.03c0.157,-0.468 0.362,-0.929 0.62,-1.374 0.256,-0.444 0.552,-0.853 0.88,-1.224l1.784 1.031c0.645,-0.625 1.444,-1.095 2.332,-1.346l0 -2.061c0.484,-0.098 0.986,-0.15 1.5,-0.15 0.514,0 1.016,0.052 1.5,0.15l0.001 2.063c0.863,0.246 1.668,0.7 2.33,1.344l1.785 -1.031c0.327,0.371 0.624,0.78 0.88,1.225 0.257,0.444 0.463,0.905 0.62,1.373l-1.786 1.033c0.219,0.87 0.227,1.795 0.001,2.69l1.785 1.03c-0.157,0.469 -0.363,0.93 -0.62,1.375 -0.256,0.444 -0.553,0.853 -0.88,1.224l-1.787 -1.032c-0.645,0.625 -1.441,1.095 -2.329,1.347l0 2.061c-0.484,0.098 -0.986,0.15 -1.5,0.15 -0.514,0 -1.016,-0.052 -1.5,-0.15l-0.001 -2.063c-0.864,-0.246 -1.668,-0.701 -2.331,-1.345l-1.784 1.032c-0.328,-0.371 -0.624,-0.78 -0.88,-1.225 -0.258,-0.444 -0.463,-0.905 -0.62,-1.374l1.784 -1.03z"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-sort.vugu b/icons/l-sort.vugu
index fdac847..d487a4e 100644
--- a/icons/l-sort.vugu
+++ b/icons/l-sort.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M1.5 4.5l13 0m-11 4l9 0m-7 4l5 0" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M1.5 4.5l13 0m-11 4l9 0m-7 4l5 0" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-sort_vgen.go b/icons/l-sort_vgen.go
index ee6e0dd..b079994 100644
--- a/icons/l-sort_vgen.go
+++ b/icons/l-sort_vgen.go
@@ -31,14 +31,14 @@ func (c *LSort) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M1.5 4.5l13 0m-11 4l9 0m-7 4l5 0"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M1.5 4.5l13 0m-11 4l9 0m-7 4l5 0"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-star.vugu b/icons/l-star.vugu
index 2deddfe..2ef420a 100644
--- a/icons/l-star.vugu
+++ b/icons/l-star.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<polygon class="d3c-icon-stroke" points="8,1.24 10.44,5.77 15.5,6.68 11.95,10.4 12.64,15.5 8,13.27 3.37,15.5 4.06,10.4 0.5,6.68 5.56,5.77" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<polygon class="d3c-icon-stroke" points="8,1.24 10.44,5.77 15.5,6.68 11.95,10.4 12.64,15.5 8,13.27 3.37,15.5 4.06,10.4 0.5,6.68 5.56,5.77" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-star_vgen.go b/icons/l-star_vgen.go
index 2852dab..3ee986d 100644
--- a/icons/l-star_vgen.go
+++ b/icons/l-star_vgen.go
@@ -31,14 +31,14 @@ func (c *LStar) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "polygon", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "points", Val: "8,1.24 10.44,5.77 15.5,6.68 11.95,10.4 12.64,15.5 8,13.27 3.37,15.5 4.06,10.4 0.5,6.68 5.56,5.77"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "polygon", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "points", Val: "8,1.24 10.44,5.77 15.5,6.68 11.95,10.4 12.64,15.5 8,13.27 3.37,15.5 4.06,10.4 0.5,6.68 5.56,5.77"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-start.vugu b/icons/l-start.vugu
index dc516b3..2f6d8e2 100644
--- a/icons/l-start.vugu
+++ b/icons/l-start.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M4.7 2.75l7.76 4.34c0.5,0.28 0.78,0.78 0.77,1.36 -0.02,0.57 -0.33,1.06 -0.85,1.31l-7.76 3.72c-0.48,0.23 -1,0.2 -1.45,-0.08 -0.45,-0.28 -0.7,-0.74 -0.7,-1.27l0 -8.06c0,-0.55 0.27,-1.02 0.74,-1.29 0.47,-0.28 1.01,-0.28 1.49,-0.01z" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M4.7 2.75l7.76 4.34c0.5,0.28 0.78,0.78 0.77,1.36 -0.02,0.57 -0.33,1.06 -0.85,1.31l-7.76 3.72c-0.48,0.23 -1,0.2 -1.45,-0.08 -0.45,-0.28 -0.7,-0.74 -0.7,-1.27l0 -8.06c0,-0.55 0.27,-1.02 0.74,-1.29 0.47,-0.28 1.01,-0.28 1.49,-0.01z" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-start_vgen.go b/icons/l-start_vgen.go
index 29cad8b..deeb1aa 100644
--- a/icons/l-start_vgen.go
+++ b/icons/l-start_vgen.go
@@ -31,14 +31,14 @@ func (c *LStart) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M4.7 2.75l7.76 4.34c0.5,0.28 0.78,0.78 0.77,1.36 -0.02,0.57 -0.33,1.06 -0.85,1.31l-7.76 3.72c-0.48,0.23 -1,0.2 -1.45,-0.08 -0.45,-0.28 -0.7,-0.74 -0.7,-1.27l0 -8.06c0,-0.55 0.27,-1.02 0.74,-1.29 0.47,-0.28 1.01,-0.28 1.49,-0.01z"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M4.7 2.75l7.76 4.34c0.5,0.28 0.78,0.78 0.77,1.36 -0.02,0.57 -0.33,1.06 -0.85,1.31l-7.76 3.72c-0.48,0.23 -1,0.2 -1.45,-0.08 -0.45,-0.28 -0.7,-0.74 -0.7,-1.27l0 -8.06c0,-0.55 0.27,-1.02 0.74,-1.29 0.47,-0.28 1.01,-0.28 1.49,-0.01z"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-stop-watch.vugu b/icons/l-stop-watch.vugu
index 72b8810..4aa4d6d 100644
--- a/icons/l-stop-watch.vugu
+++ b/icons/l-stop-watch.vugu
@@ -1,12 +1,28 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M7.51 4.5l0 5m-2 -9l4 0m3 2l2 2" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
-	<circle class="d3c-icon-stroke" cx="7.49" cy="9" r="6.5" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M7.51 4.5l0 5m-2 -9l4 0m3 2l2 2" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<circle class="d3c-icon-stroke" cx="7.49" cy="9" r="6.5" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-stop-watch_vgen.go b/icons/l-stop-watch_vgen.go
index d58218f..6ad82f1 100644
--- a/icons/l-stop-watch_vgen.go
+++ b/icons/l-stop-watch_vgen.go
@@ -31,18 +31,18 @@ func (c *LStopWatch) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M7.51 4.5l0 5m-2 -9l4 0m3 2l2 2"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M7.51 4.5l0 5m-2 -9l4 0m3 2l2 2"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "7.49"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "9"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "6.5"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "7.49"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "9"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "6.5"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-stop.vugu b/icons/l-stop.vugu
index e857cfa..98287bc 100644
--- a/icons/l-stop.vugu
+++ b/icons/l-stop.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M3.98 2.5l8 0c0.83,0 1.5,0.67 1.5,1.5l0 8c0,0.83 -0.67,1.5 -1.5,1.5l-8 0c-0.83,0 -1.5,-0.67 -1.5,-1.5l0 -8c0,-0.83 0.67,-1.5 1.5,-1.5z" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M3.98 2.5l8 0c0.83,0 1.5,0.67 1.5,1.5l0 8c0,0.83 -0.67,1.5 -1.5,1.5l-8 0c-0.83,0 -1.5,-0.67 -1.5,-1.5l0 -8c0,-0.83 0.67,-1.5 1.5,-1.5z" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-stop_vgen.go b/icons/l-stop_vgen.go
index 649af96..3d5d159 100644
--- a/icons/l-stop_vgen.go
+++ b/icons/l-stop_vgen.go
@@ -31,14 +31,14 @@ func (c *LStop) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M3.98 2.5l8 0c0.83,0 1.5,0.67 1.5,1.5l0 8c0,0.83 -0.67,1.5 -1.5,1.5l-8 0c-0.83,0 -1.5,-0.67 -1.5,-1.5l0 -8c0,-0.83 0.67,-1.5 1.5,-1.5z"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M3.98 2.5l8 0c0.83,0 1.5,0.67 1.5,1.5l0 8c0,0.83 -0.67,1.5 -1.5,1.5l-8 0c-0.83,0 -1.5,-0.67 -1.5,-1.5l0 -8c0,-0.83 0.67,-1.5 1.5,-1.5z"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-undo.vugu b/icons/l-undo.vugu
index 4be2ba0..a7897fa 100644
--- a/icons/l-undo.vugu
+++ b/icons/l-undo.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M6.653 15.496l5.501 -5.5c1.951,-1.952 1.951,-5.115 0,-7.066 -1.952,-1.952 -5.115,-1.952 -7.066,-0.001l-3.575 3.57m0 -4.242l0 4.242 4.243 0" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M6.653 15.496l5.501 -5.5c1.951,-1.952 1.951,-5.115 0,-7.066 -1.952,-1.952 -5.115,-1.952 -7.066,-0.001l-3.575 3.57m0 -4.242l0 4.242 4.243 0" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-undo_vgen.go b/icons/l-undo_vgen.go
index 95739b2..e094eb3 100644
--- a/icons/l-undo_vgen.go
+++ b/icons/l-undo_vgen.go
@@ -31,14 +31,14 @@ func (c *LUndo) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M6.653 15.496l5.501 -5.5c1.951,-1.952 1.951,-5.115 0,-7.066 -1.952,-1.952 -5.115,-1.952 -7.066,-0.001l-3.575 3.57m0 -4.242l0 4.242 4.243 0"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M6.653 15.496l5.501 -5.5c1.951,-1.952 1.951,-5.115 0,-7.066 -1.952,-1.952 -5.115,-1.952 -7.066,-0.001l-3.575 3.57m0 -4.242l0 4.242 4.243 0"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-upload.vugu b/icons/l-upload.vugu
index 3c09b10..924ca19 100644
--- a/icons/l-upload.vugu
+++ b/icons/l-upload.vugu
@@ -1,11 +1,27 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M14.5 10.5l0 4c0,0.5 -0.5,1 -1,1l-12 -0c-0.5,0 -1,-0.5 -1,-1l0 -4m10 -5l-3 -3 -3 3m3 -3l0 9" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M14.5 10.5l0 4c0,0.5 -0.5,1 -1,1l-12 -0c-0.5,0 -1,-0.5 -1,-1l0 -4m10 -5l-3 -3 -3 3m3 -3l0 9" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-upload_vgen.go b/icons/l-upload_vgen.go
index 07b4d73..7894b7c 100644
--- a/icons/l-upload_vgen.go
+++ b/icons/l-upload_vgen.go
@@ -31,14 +31,14 @@ func (c *LUpload) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M14.5 10.5l0 4c0,0.5 -0.5,1 -1,1l-12 -0c-0.5,0 -1,-0.5 -1,-1l0 -4m10 -5l-3 -3 -3 3m3 -3l0 9"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M14.5 10.5l0 4c0,0.5 -0.5,1 -1,1l-12 -0c-0.5,0 -1,-0.5 -1,-1l0 -4m10 -5l-3 -3 -3 3m3 -3l0 9"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-warehouse.vugu b/icons/l-warehouse.vugu
index aa99949..0a82d90 100644
--- a/icons/l-warehouse.vugu
+++ b/icons/l-warehouse.vugu
@@ -1,12 +1,28 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M14.5 15.5l-2 0 0 -9.0 -9.0 0 0 9.0 -2 -0c-0.272,0 -0.512,-0.1 -0.707,-0.293 -0.195,-0.195 -0.292,-0.433 -0.292,-0.708l0.015 -9 7 -5 1 0 6.982 5 0 9c0,0.54 -0.461,1 -1,1z" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
-	<path class="d3c-icon-stroke" d="M3.5 15.5l3 0 0 -3 -3 0 0 3zm3 0l3 0 0 -3 -3 0 0 3zm-1 -3l3 0 0 -3 -3 0 0 3z" width="3.0" height="3.0" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M14.5 15.5l-2 0 0 -9.0 -9.0 0 0 9.0 -2 -0c-0.272,0 -0.512,-0.1 -0.707,-0.293 -0.195,-0.195 -0.292,-0.433 -0.292,-0.708l0.015 -9 7 -5 1 0 6.982 5 0 9c0,0.54 -0.461,1 -1,1z" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M3.5 15.5l3 0 0 -3 -3 0 0 3zm3 0l3 0 0 -3 -3 0 0 3zm-1 -3l3 0 0 -3 -3 0 0 3z" width="3.0" height="3.0" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-warehouse_vgen.go b/icons/l-warehouse_vgen.go
index 99a7954..1200008 100644
--- a/icons/l-warehouse_vgen.go
+++ b/icons/l-warehouse_vgen.go
@@ -31,18 +31,18 @@ func (c *LWarehouse) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M14.5 15.5l-2 0 0 -9.0 -9.0 0 0 9.0 -2 -0c-0.272,0 -0.512,-0.1 -0.707,-0.293 -0.195,-0.195 -0.292,-0.433 -0.292,-0.708l0.015 -9 7 -5 1 0 6.982 5 0 9c0,0.54 -0.461,1 -1,1z"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M14.5 15.5l-2 0 0 -9.0 -9.0 0 0 9.0 -2 -0c-0.272,0 -0.512,-0.1 -0.707,-0.293 -0.195,-0.195 -0.292,-0.433 -0.292,-0.708l0.015 -9 7 -5 1 0 6.982 5 0 9c0,0.54 -0.461,1 -1,1z"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M3.5 15.5l3 0 0 -3 -3 0 0 3zm3 0l3 0 0 -3 -3 0 0 3zm-1 -3l3 0 0 -3 -3 0 0 3z"}, vugu.VGAttribute{Namespace: "", Key: "width", Val: "3.0"}, vugu.VGAttribute{Namespace: "", Key: "height", Val: "3.0"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M3.5 15.5l3 0 0 -3 -3 0 0 3zm3 0l3 0 0 -3 -3 0 0 3zm-1 -3l3 0 0 -3 -3 0 0 3z"}, vugu.VGAttribute{Namespace: "", Key: "width", Val: "3.0"}, vugu.VGAttribute{Namespace: "", Key: "height", Val: "3.0"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-warning.vugu b/icons/l-warning.vugu
index b6e0804..81a9e77 100644
--- a/icons/l-warning.vugu
+++ b/icons/l-warning.vugu
@@ -1,12 +1,28 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M7.5 7.5l0 4m7 4l-14 0 7 -14 7 14z" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
-	<circle class="d3c-icon-fill" cx="7.5" cy="13.5" r="0.5" fill="black"/>
+	<path class="d3c-icon-stroke" d="M7.5 7.5l0 4m7 4l-14 0 7 -14 7 14z" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<circle class="d3c-icon-fill" cx="7.5" cy="13.5" r="0.5" stroke="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-warning_vgen.go b/icons/l-warning_vgen.go
index af5b8fb..47349e2 100644
--- a/icons/l-warning_vgen.go
+++ b/icons/l-warning_vgen.go
@@ -31,18 +31,18 @@ func (c *LWarning) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M7.5 7.5l0 4m7 4l-14 0 7 -14 7 14z"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M7.5 7.5l0 4m7 4l-14 0 7 -14 7 14z"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-fill"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "7.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "13.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "0.5"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "black"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-fill"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "7.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "13.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "0.5"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-zoom-in.vugu b/icons/l-zoom-in.vugu
index e0c12fe..52fde75 100644
--- a/icons/l-zoom-in.vugu
+++ b/icons/l-zoom-in.vugu
@@ -1,12 +1,28 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M5.5 4.5l0 4m2 -2l-4 0m11 9l-5.465 -5.464" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
-	<circle class="d3c-icon-stroke" cx="5.5" cy="6.5" r="5" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M5.5 4.5l0 4m2 -2l-4 0m11 9l-5.465 -5.464" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<circle class="d3c-icon-stroke" cx="5.5" cy="6.5" r="5" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-zoom-in_vgen.go b/icons/l-zoom-in_vgen.go
index a4d5cd7..a211b71 100644
--- a/icons/l-zoom-in_vgen.go
+++ b/icons/l-zoom-in_vgen.go
@@ -31,18 +31,18 @@ func (c *LZoomIn) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M5.5 4.5l0 4m2 -2l-4 0m11 9l-5.465 -5.464"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M5.5 4.5l0 4m2 -2l-4 0m11 9l-5.465 -5.464"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "5.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "6.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "5"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "5.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "6.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "5"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-zoom-out.vugu b/icons/l-zoom-out.vugu
index 99fe8b1..a7ffb97 100644
--- a/icons/l-zoom-out.vugu
+++ b/icons/l-zoom-out.vugu
@@ -1,12 +1,28 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<path class="d3c-icon-stroke" d="M5.5 4.5m2 2l-4 0m11 9l-5.465 -5.464" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
-	<circle class="d3c-icon-stroke" cx="5.5" cy="6.5" r="5" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<path class="d3c-icon-stroke" d="M5.5 4.5m2 2l-4 0m11 9l-5.465 -5.464" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<circle class="d3c-icon-stroke" cx="5.5" cy="6.5" r="5" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-zoom-out_vgen.go b/icons/l-zoom-out_vgen.go
index 7f44600..6405d7d 100644
--- a/icons/l-zoom-out_vgen.go
+++ b/icons/l-zoom-out_vgen.go
@@ -31,18 +31,18 @@ func (c *LZoomOut) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M5.5 4.5m2 2l-4 0m11 9l-5.465 -5.464"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "path", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "d", Val: "M5.5 4.5m2 2l-4 0m11 9l-5.465 -5.464"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "5.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "6.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "5"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "5.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "6.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "5"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/icons/l-zoom.vugu b/icons/l-zoom.vugu
index 714b162..26231c7 100644
--- a/icons/l-zoom.vugu
+++ b/icons/l-zoom.vugu
@@ -1,12 +1,28 @@
 <svg viewBox="0 0 16 16" vg-attr='utils.AttributesAppend{AttrMap: c.AttrMap, Classes: "d3c-icon d3-lineicon"}'>
-	<line class="d3c-icon-stroke" x1="14.5" y1="15.5" x2="9.034" y2= "10.035" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
-	<circle class="d3c-icon-stroke" cx="5.5" cy="6.5" r="5" stroke="black" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<line class="d3c-icon-stroke" x1="14.5" y1="15.5" x2="9.034" y2= "10.035" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
+	<circle class="d3c-icon-stroke" cx="5.5" cy="6.5" r="5" stroke-width="1" stroke-linejoin="round" stroke-linecap="round" fill="none"/>
 </svg>
 
 <style>
 	.d3c-icon {
 		height: 1em;
 	}
+
+	.d3c-icon-stroke {
+		stroke: var(--d3c-color-text);
+	}
+
+	.d3c-icon-fill {
+		fill: var(--d3c-color-text);
+	}
+
+	.d3c-icon-use-color .d3c-icon-stroke {
+		stroke: var(--d3c-color-background);
+	}
+
+	.d3c-icon-use-color .d3c-icon-fill {
+		fill: var(--d3c-color-background);
+	}
 </style>
 
 <script type="application/x-go">
diff --git a/icons/l-zoom_vgen.go b/icons/l-zoom_vgen.go
index 6f53dcd..c9db945 100644
--- a/icons/l-zoom_vgen.go
+++ b/icons/l-zoom_vgen.go
@@ -31,18 +31,18 @@ func (c *LZoom) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		_ = vgparent
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "line", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "x1", Val: "14.5"}, vugu.VGAttribute{Namespace: "", Key: "y1", Val: "15.5"}, vugu.VGAttribute{Namespace: "", Key: "x2", Val: "9.034"}, vugu.VGAttribute{Namespace: "", Key: "y2", Val: "10.035"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "line", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "x1", Val: "14.5"}, vugu.VGAttribute{Namespace: "", Key: "y1", Val: "15.5"}, vugu.VGAttribute{Namespace: "", Key: "x2", Val: "9.034"}, vugu.VGAttribute{Namespace: "", Key: "y2", Val: "10.035"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
-		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "5.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "6.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "5"}, vugu.VGAttribute{Namespace: "", Key: "stroke", Val: "black"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "svg", Data: "circle", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "d3c-icon-stroke"}, vugu.VGAttribute{Namespace: "", Key: "cx", Val: "5.5"}, vugu.VGAttribute{Namespace: "", Key: "cy", Val: "6.5"}, vugu.VGAttribute{Namespace: "", Key: "r", Val: "5"}, vugu.VGAttribute{Namespace: "", Key: "stroke-width", Val: "1"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linejoin", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "stroke-linecap", Val: "round"}, vugu.VGAttribute{Namespace: "", Key: "fill", Val: "none"}}}
 		vgparent.AppendChild(vgn)
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
 		vgparent.AppendChild(vgn)
 	}
 	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
 	{
-		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.d3c-icon {\n\t\theight: 1em;\n\t}\n\n\t.d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-fill {\n\t\tfill: var(--d3c-color-text);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-stroke {\n\t\tstroke: var(--d3c-color-background);\n\t}\n\n\t.d3c-icon-use-color .d3c-icon-fill {\n\t\tfill: var(--d3c-color-background);\n\t}\n", Attr: []vugu.VGAttribute(nil)})
 	}
 	vgout.AppendCSS(vgn)
 	return vgout
diff --git a/page-colors.vugu b/page-colors.vugu
new file mode 100644
index 0000000..ae5794f
--- /dev/null
+++ b/page-colors.vugu
@@ -0,0 +1,131 @@
+<div>
+	<layout:Container>
+		<h2>Signal colors</h2>
+		<p>Colors can be set via special color classes:</p>
+		<ul>
+			<li><view:CodeInline>d3c-color-layer-0</view:CodeInline> This is the default color scheme.</li>
+			<li><view:CodeInline>d3c-color-layer-1</view:CodeInline></li>
+			<li><view:CodeInline>d3c-color-layer-2</view:CodeInline></li>
+			<li><view:CodeInline>d3c-color-accent</view:CodeInline></li>
+			<li><view:CodeInline>d3c-color-success</view:CodeInline></li>
+			<li><view:CodeInline>d3c-color-success-faded</view:CodeInline></li>
+			<li><view:CodeInline>d3c-color-attention</view:CodeInline></li>
+			<li><view:CodeInline>d3c-color-attention-faded</view:CodeInline></li>
+			<li><view:CodeInline>d3c-color-caution</view:CodeInline></li>
+			<li><view:CodeInline>d3c-color-caution-faded</view:CodeInline></li>
+			<li><view:CodeInline>d3c-color-critical</view:CodeInline></li>
+			<li><view:CodeInline>d3c-color-critical-faded</view:CodeInline></li>
+		</ul>
+
+		<h2>Buttons</h2>
+		<view:Code>
+			<pre vg-content='"<input:Button class=\"d3c-color-success\">\n" +
+							"	<vg-slot name=\"SymbolSlot\"><icons:LPlus></icons:LPlus></vg-slot>\n" +
+							"	<vg-slot name=\"DefaultSlot\">Successful action</vg-slot>\n" +
+							"</input:Button>"' style="margin: 0;"></pre>
+		</view:Code>
+		<div class="flex-container">
+			<input:Button class="d3c-color-success">
+				<vg-slot name="SymbolSlot"><icons:LPlus></icons:LPlus></vg-slot>
+				<vg-slot name="DefaultSlot">Successful action</vg-slot>
+			</input:Button>
+			<input:Button class="d3c-color-attention">
+				<vg-slot name="SymbolSlot"><icons:LGlobe></icons:LGlobe></vg-slot>
+				<vg-slot name="DefaultSlot">Highlighted action</vg-slot>
+			</input:Button>
+			<input:Button class="d3c-color-caution">
+				<vg-slot name="SymbolSlot"><icons:LInfoCircle></icons:LInfoCircle></vg-slot>
+				<vg-slot name="DefaultSlot">Press with caution</vg-slot>
+			</input:Button>
+			<input:Button class="d3c-color-critical">
+				<vg-slot name="SymbolSlot"><icons:LWarning></icons:LWarning></vg-slot>
+				<vg-slot name="DefaultSlot">Dangerous action</vg-slot>
+			</input:Button>
+		</div>
+		<div class="flex-container">
+			<input:Button class="d3c-color-success-faded">
+				<vg-slot name="SymbolSlot"><icons:LPlus></icons:LPlus></vg-slot>
+				<vg-slot name="DefaultSlot">Successful action</vg-slot>
+			</input:Button>
+			<input:Button class="d3c-color-attention-faded">
+				<vg-slot name="SymbolSlot"><icons:LGlobe></icons:LGlobe></vg-slot>
+				<vg-slot name="DefaultSlot">Highlighted action</vg-slot>
+			</input:Button>
+			<input:Button class="d3c-color-caution-faded">
+				<vg-slot name="SymbolSlot"><icons:LInfoCircle></icons:LInfoCircle></vg-slot>
+				<vg-slot name="DefaultSlot">Press with caution</vg-slot>
+			</input:Button>
+			<input:Button class="d3c-color-critical-faded">
+				<vg-slot name="SymbolSlot"><icons:LWarning></icons:LWarning></vg-slot>
+				<vg-slot name="DefaultSlot">Dangerous action</vg-slot>
+			</input:Button>
+		</div>
+
+		<h2>Tags</h2>
+		<view:Code>
+			<pre vg-content='"<view:Tag class=\"d3c-color-success\">This was a success</view:Tag>"' style="margin: 0;"></pre>
+		</view:Code>
+		<div class="flex-container">
+			<view:Tag class="d3c-color-success">This was a success</view:Tag>
+			<view:Tag class="d3c-color-attention">Attention needed</view:Tag>
+			<view:Tag class="d3c-color-caution">Warning</view:Tag>
+			<view:Tag class="d3c-color-critical">Something went wrong</view:Tag>
+		</div>
+		<div class="flex-container">
+			<view:Tag class="d3c-color-success-faded">This was a success</view:Tag>
+			<view:Tag class="d3c-color-attention-faded">Attention needed</view:Tag>
+			<view:Tag class="d3c-color-caution-faded">Warning</view:Tag>
+			<view:Tag class="d3c-color-critical-faded">Something went wrong</view:Tag>
+		</div>
+
+		<h2>Icons</h2>
+		<p>Icons will use the text color by default, if you need to change their stroke/fill coloring, use the <view:CodeInline>d3c-icon-use-color</view:CodeInline> class.</p>
+		<view:Code>
+			<pre vg-content='"<icons:LInfoCircle class=\"d3c-color-attention d3c-icon-use-color\"></icons:LInfoCircle>"' style="margin: 0;"></pre>
+		</view:Code>
+		<div class="flex-container" style="font-size: 2em;">
+			<icons:LInfoCircle class="d3c-color-attention d3c-icon-use-color"></icons:LInfoCircle>
+			<icons:LWarning class="d3c-color-critical d3c-icon-use-color"></icons:LWarning>
+		</div>
+
+		<h2>Containers</h2>
+		<layout:LayerContainer class="d3c-color-layer-1">
+			<span>This container uses the <view:CodeInline class="d3c-color-layer-2">d3c-color-layer-1</view:CodeInline> class. All child elements inherit the color scheme.</span>
+			<input:Button>
+				<vg-slot name="SymbolSlot"><icons:LPlus></icons:LPlus></vg-slot>
+				<vg-slot name="DefaultSlot">Does inherit color</vg-slot>
+			</input:Button>
+			<input:Button class="d3c-color-layer-0">
+				<vg-slot name="SymbolSlot"><icons:LPlus></icons:LPlus></vg-slot>
+				<vg-slot name="DefaultSlot">Doesn't inherit color</vg-slot>
+			</input:Button>
+		</layout:LayerContainer>
+		<layout:LayerContainer class="d3c-color-critical-faded">
+			<icons:LWarning></icons:LWarning> <span>Something bad happened!</span>
+		</layout:LayerContainer>
+	</layout:Container>
+</div>
+
+<style>
+	.flex-container {
+		margin: 0.5em 0;
+		display: flex;
+		flex-wrap: wrap;
+		gap: 0.5em;
+	}
+
+	.flex-container > * {
+		margin: 0;
+	}
+</style>
+
+<script type="application/x-go">
+	import (
+		"git.d3nexus.de/Dadido3/D3vugu-components/components/layout"
+		"git.d3nexus.de/Dadido3/D3vugu-components/components/view"
+		"git.d3nexus.de/Dadido3/D3vugu-components/components/input"
+		"git.d3nexus.de/Dadido3/D3vugu-components/icons"
+	)
+
+	type PageColors struct {}
+</script>
diff --git a/page-colors_vgen.go b/page-colors_vgen.go
new file mode 100644
index 0000000..8c84ebd
--- /dev/null
+++ b/page-colors_vgen.go
@@ -0,0 +1,1602 @@
+package main
+
+// Code generated by vugu via vugugen. Please regenerate instead of editing or add additional code in a separate file. DO NOT EDIT.
+
+import "fmt"
+import "reflect"
+import "github.com/vugu/vjson"
+import "github.com/vugu/vugu"
+import js "github.com/vugu/vugu/js"
+
+import (
+	"git.d3nexus.de/Dadido3/D3vugu-components/components/input"
+	"git.d3nexus.de/Dadido3/D3vugu-components/components/layout"
+	"git.d3nexus.de/Dadido3/D3vugu-components/components/view"
+	"git.d3nexus.de/Dadido3/D3vugu-components/icons"
+)
+
+type PageColors struct{}
+
+func (c *PageColors) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+
+	vgout = &vugu.BuildOut{}
+
+	var vgiterkey interface{}
+	_ = vgiterkey
+	var vgn *vugu.VGNode
+	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "div", Attr: []vugu.VGAttribute(nil)}
+	vgout.Out = append(vgout.Out, vgn)	// root for output
+	{
+		vgparent := vgn
+		_ = vgparent
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
+		vgparent.AppendChild(vgn)
+		{
+			vgcompKey := vugu.MakeCompKey(0xF3D0821CE3DF6A74^vgin.CurrentPositionHash(), vgiterkey)
+			// ask BuildEnv for prior instance of this specific component
+			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*layout.Container)
+			if vgcomp == nil {
+				// create new one if needed
+				vgcomp = new(layout.Container)
+				vgin.BuildEnv.WireComponent(vgcomp)
+			}
+			vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+			vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+				vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+				vgout = &vugu.BuildOut{}
+				vgout.Out = append(vgout.Out, vgn)
+				vgparent := vgn
+				_ = vgparent
+
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
+				vgparent.AppendChild(vgn)
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "h2", Attr: []vugu.VGAttribute(nil)}
+				vgparent.AppendChild(vgn)
+				vgn.SetInnerHTML(vugu.HTML("Signal colors"))
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
+				vgparent.AppendChild(vgn)
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "p", Attr: []vugu.VGAttribute(nil)}
+				vgparent.AppendChild(vgn)
+				vgn.SetInnerHTML(vugu.HTML("Colors can be set via special color classes:"))
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
+				vgparent.AppendChild(vgn)
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "ul", Attr: []vugu.VGAttribute(nil)}
+				vgparent.AppendChild(vgn)
+				{
+					vgparent := vgn
+					_ = vgparent
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+					vgparent.AppendChild(vgn)
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "li", Attr: []vugu.VGAttribute(nil)}
+					vgparent.AppendChild(vgn)
+					{
+						vgparent := vgn
+						_ = vgparent
+						{
+							vgcompKey := vugu.MakeCompKey(0x6D73F9FAAA216E82^vgin.CurrentPositionHash(), vgiterkey)
+							// ask BuildEnv for prior instance of this specific component
+							vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*view.CodeInline)
+							if vgcomp == nil {
+								// create new one if needed
+								vgcomp = new(view.CodeInline)
+								vgin.BuildEnv.WireComponent(vgcomp)
+							}
+							vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+							vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+								vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+								vgout = &vugu.BuildOut{}
+								vgout.Out = append(vgout.Out, vgn)
+								vgparent := vgn
+								_ = vgparent
+
+								vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "d3c-color-layer-0"}
+								vgparent.AppendChild(vgn)
+								return
+							})
+							vgout.Components = append(vgout.Components, vgcomp)
+							vgn = &vugu.VGNode{Component: vgcomp}
+							vgparent.AppendChild(vgn)
+						}
+						vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: " This is the default color scheme."}
+						vgparent.AppendChild(vgn)
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+					vgparent.AppendChild(vgn)
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "li", Attr: []vugu.VGAttribute(nil)}
+					vgparent.AppendChild(vgn)
+					{
+						vgparent := vgn
+						_ = vgparent
+						{
+							vgcompKey := vugu.MakeCompKey(0x8A726494AD3412F2^vgin.CurrentPositionHash(), vgiterkey)
+							// ask BuildEnv for prior instance of this specific component
+							vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*view.CodeInline)
+							if vgcomp == nil {
+								// create new one if needed
+								vgcomp = new(view.CodeInline)
+								vgin.BuildEnv.WireComponent(vgcomp)
+							}
+							vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+							vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+								vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+								vgout = &vugu.BuildOut{}
+								vgout.Out = append(vgout.Out, vgn)
+								vgparent := vgn
+								_ = vgparent
+
+								vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "d3c-color-layer-1"}
+								vgparent.AppendChild(vgn)
+								return
+							})
+							vgout.Components = append(vgout.Components, vgcomp)
+							vgn = &vugu.VGNode{Component: vgcomp}
+							vgparent.AppendChild(vgn)
+						}
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+					vgparent.AppendChild(vgn)
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "li", Attr: []vugu.VGAttribute(nil)}
+					vgparent.AppendChild(vgn)
+					{
+						vgparent := vgn
+						_ = vgparent
+						{
+							vgcompKey := vugu.MakeCompKey(0xB19ED2341B7E3900^vgin.CurrentPositionHash(), vgiterkey)
+							// ask BuildEnv for prior instance of this specific component
+							vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*view.CodeInline)
+							if vgcomp == nil {
+								// create new one if needed
+								vgcomp = new(view.CodeInline)
+								vgin.BuildEnv.WireComponent(vgcomp)
+							}
+							vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+							vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+								vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+								vgout = &vugu.BuildOut{}
+								vgout.Out = append(vgout.Out, vgn)
+								vgparent := vgn
+								_ = vgparent
+
+								vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "d3c-color-layer-2"}
+								vgparent.AppendChild(vgn)
+								return
+							})
+							vgout.Components = append(vgout.Components, vgcomp)
+							vgn = &vugu.VGNode{Component: vgcomp}
+							vgparent.AppendChild(vgn)
+						}
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+					vgparent.AppendChild(vgn)
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "li", Attr: []vugu.VGAttribute(nil)}
+					vgparent.AppendChild(vgn)
+					{
+						vgparent := vgn
+						_ = vgparent
+						{
+							vgcompKey := vugu.MakeCompKey(0x4A899082DCE15CD1^vgin.CurrentPositionHash(), vgiterkey)
+							// ask BuildEnv for prior instance of this specific component
+							vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*view.CodeInline)
+							if vgcomp == nil {
+								// create new one if needed
+								vgcomp = new(view.CodeInline)
+								vgin.BuildEnv.WireComponent(vgcomp)
+							}
+							vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+							vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+								vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+								vgout = &vugu.BuildOut{}
+								vgout.Out = append(vgout.Out, vgn)
+								vgparent := vgn
+								_ = vgparent
+
+								vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "d3c-color-accent"}
+								vgparent.AppendChild(vgn)
+								return
+							})
+							vgout.Components = append(vgout.Components, vgcomp)
+							vgn = &vugu.VGNode{Component: vgcomp}
+							vgparent.AppendChild(vgn)
+						}
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+					vgparent.AppendChild(vgn)
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "li", Attr: []vugu.VGAttribute(nil)}
+					vgparent.AppendChild(vgn)
+					{
+						vgparent := vgn
+						_ = vgparent
+						{
+							vgcompKey := vugu.MakeCompKey(0xB4C843DDC27EB99B^vgin.CurrentPositionHash(), vgiterkey)
+							// ask BuildEnv for prior instance of this specific component
+							vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*view.CodeInline)
+							if vgcomp == nil {
+								// create new one if needed
+								vgcomp = new(view.CodeInline)
+								vgin.BuildEnv.WireComponent(vgcomp)
+							}
+							vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+							vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+								vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+								vgout = &vugu.BuildOut{}
+								vgout.Out = append(vgout.Out, vgn)
+								vgparent := vgn
+								_ = vgparent
+
+								vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "d3c-color-success"}
+								vgparent.AppendChild(vgn)
+								return
+							})
+							vgout.Components = append(vgout.Components, vgcomp)
+							vgn = &vugu.VGNode{Component: vgcomp}
+							vgparent.AppendChild(vgn)
+						}
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+					vgparent.AppendChild(vgn)
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "li", Attr: []vugu.VGAttribute(nil)}
+					vgparent.AppendChild(vgn)
+					{
+						vgparent := vgn
+						_ = vgparent
+						{
+							vgcompKey := vugu.MakeCompKey(0xF658B7B75ED9B09A^vgin.CurrentPositionHash(), vgiterkey)
+							// ask BuildEnv for prior instance of this specific component
+							vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*view.CodeInline)
+							if vgcomp == nil {
+								// create new one if needed
+								vgcomp = new(view.CodeInline)
+								vgin.BuildEnv.WireComponent(vgcomp)
+							}
+							vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+							vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+								vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+								vgout = &vugu.BuildOut{}
+								vgout.Out = append(vgout.Out, vgn)
+								vgparent := vgn
+								_ = vgparent
+
+								vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "d3c-color-success-faded"}
+								vgparent.AppendChild(vgn)
+								return
+							})
+							vgout.Components = append(vgout.Components, vgcomp)
+							vgn = &vugu.VGNode{Component: vgcomp}
+							vgparent.AppendChild(vgn)
+						}
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+					vgparent.AppendChild(vgn)
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "li", Attr: []vugu.VGAttribute(nil)}
+					vgparent.AppendChild(vgn)
+					{
+						vgparent := vgn
+						_ = vgparent
+						{
+							vgcompKey := vugu.MakeCompKey(0x38E1D69F942BF4F5^vgin.CurrentPositionHash(), vgiterkey)
+							// ask BuildEnv for prior instance of this specific component
+							vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*view.CodeInline)
+							if vgcomp == nil {
+								// create new one if needed
+								vgcomp = new(view.CodeInline)
+								vgin.BuildEnv.WireComponent(vgcomp)
+							}
+							vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+							vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+								vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+								vgout = &vugu.BuildOut{}
+								vgout.Out = append(vgout.Out, vgn)
+								vgparent := vgn
+								_ = vgparent
+
+								vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "d3c-color-attention"}
+								vgparent.AppendChild(vgn)
+								return
+							})
+							vgout.Components = append(vgout.Components, vgcomp)
+							vgn = &vugu.VGNode{Component: vgcomp}
+							vgparent.AppendChild(vgn)
+						}
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+					vgparent.AppendChild(vgn)
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "li", Attr: []vugu.VGAttribute(nil)}
+					vgparent.AppendChild(vgn)
+					{
+						vgparent := vgn
+						_ = vgparent
+						{
+							vgcompKey := vugu.MakeCompKey(0x13B142555424A64^vgin.CurrentPositionHash(), vgiterkey)
+							// ask BuildEnv for prior instance of this specific component
+							vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*view.CodeInline)
+							if vgcomp == nil {
+								// create new one if needed
+								vgcomp = new(view.CodeInline)
+								vgin.BuildEnv.WireComponent(vgcomp)
+							}
+							vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+							vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+								vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+								vgout = &vugu.BuildOut{}
+								vgout.Out = append(vgout.Out, vgn)
+								vgparent := vgn
+								_ = vgparent
+
+								vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "d3c-color-attention-faded"}
+								vgparent.AppendChild(vgn)
+								return
+							})
+							vgout.Components = append(vgout.Components, vgcomp)
+							vgn = &vugu.VGNode{Component: vgcomp}
+							vgparent.AppendChild(vgn)
+						}
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+					vgparent.AppendChild(vgn)
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "li", Attr: []vugu.VGAttribute(nil)}
+					vgparent.AppendChild(vgn)
+					{
+						vgparent := vgn
+						_ = vgparent
+						{
+							vgcompKey := vugu.MakeCompKey(0xDDA053F0A495AA39^vgin.CurrentPositionHash(), vgiterkey)
+							// ask BuildEnv for prior instance of this specific component
+							vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*view.CodeInline)
+							if vgcomp == nil {
+								// create new one if needed
+								vgcomp = new(view.CodeInline)
+								vgin.BuildEnv.WireComponent(vgcomp)
+							}
+							vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+							vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+								vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+								vgout = &vugu.BuildOut{}
+								vgout.Out = append(vgout.Out, vgn)
+								vgparent := vgn
+								_ = vgparent
+
+								vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "d3c-color-caution"}
+								vgparent.AppendChild(vgn)
+								return
+							})
+							vgout.Components = append(vgout.Components, vgcomp)
+							vgn = &vugu.VGNode{Component: vgcomp}
+							vgparent.AppendChild(vgn)
+						}
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+					vgparent.AppendChild(vgn)
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "li", Attr: []vugu.VGAttribute(nil)}
+					vgparent.AppendChild(vgn)
+					{
+						vgparent := vgn
+						_ = vgparent
+						{
+							vgcompKey := vugu.MakeCompKey(0xB95C9BD6E5CB94A7^vgin.CurrentPositionHash(), vgiterkey)
+							// ask BuildEnv for prior instance of this specific component
+							vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*view.CodeInline)
+							if vgcomp == nil {
+								// create new one if needed
+								vgcomp = new(view.CodeInline)
+								vgin.BuildEnv.WireComponent(vgcomp)
+							}
+							vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+							vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+								vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+								vgout = &vugu.BuildOut{}
+								vgout.Out = append(vgout.Out, vgn)
+								vgparent := vgn
+								_ = vgparent
+
+								vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "d3c-color-caution-faded"}
+								vgparent.AppendChild(vgn)
+								return
+							})
+							vgout.Components = append(vgout.Components, vgcomp)
+							vgn = &vugu.VGNode{Component: vgcomp}
+							vgparent.AppendChild(vgn)
+						}
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+					vgparent.AppendChild(vgn)
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "li", Attr: []vugu.VGAttribute(nil)}
+					vgparent.AppendChild(vgn)
+					{
+						vgparent := vgn
+						_ = vgparent
+						{
+							vgcompKey := vugu.MakeCompKey(0x62CFE288D87324DD^vgin.CurrentPositionHash(), vgiterkey)
+							// ask BuildEnv for prior instance of this specific component
+							vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*view.CodeInline)
+							if vgcomp == nil {
+								// create new one if needed
+								vgcomp = new(view.CodeInline)
+								vgin.BuildEnv.WireComponent(vgcomp)
+							}
+							vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+							vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+								vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+								vgout = &vugu.BuildOut{}
+								vgout.Out = append(vgout.Out, vgn)
+								vgparent := vgn
+								_ = vgparent
+
+								vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "d3c-color-critical"}
+								vgparent.AppendChild(vgn)
+								return
+							})
+							vgout.Components = append(vgout.Components, vgcomp)
+							vgn = &vugu.VGNode{Component: vgcomp}
+							vgparent.AppendChild(vgn)
+						}
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+					vgparent.AppendChild(vgn)
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "li", Attr: []vugu.VGAttribute(nil)}
+					vgparent.AppendChild(vgn)
+					{
+						vgparent := vgn
+						_ = vgparent
+						{
+							vgcompKey := vugu.MakeCompKey(0x4CD7E0BA598E7F42^vgin.CurrentPositionHash(), vgiterkey)
+							// ask BuildEnv for prior instance of this specific component
+							vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*view.CodeInline)
+							if vgcomp == nil {
+								// create new one if needed
+								vgcomp = new(view.CodeInline)
+								vgin.BuildEnv.WireComponent(vgcomp)
+							}
+							vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+							vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+								vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+								vgout = &vugu.BuildOut{}
+								vgout.Out = append(vgout.Out, vgn)
+								vgparent := vgn
+								_ = vgparent
+
+								vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "d3c-color-critical-faded"}
+								vgparent.AppendChild(vgn)
+								return
+							})
+							vgout.Components = append(vgout.Components, vgcomp)
+							vgn = &vugu.VGNode{Component: vgcomp}
+							vgparent.AppendChild(vgn)
+						}
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
+					vgparent.AppendChild(vgn)
+				}
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\n\t\t"}
+				vgparent.AppendChild(vgn)
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "h2", Attr: []vugu.VGAttribute(nil)}
+				vgparent.AppendChild(vgn)
+				vgn.SetInnerHTML(vugu.HTML("Buttons"))
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
+				vgparent.AppendChild(vgn)
+				{
+					vgcompKey := vugu.MakeCompKey(0xA52B0E0031F62F51^vgin.CurrentPositionHash(), vgiterkey)
+					// ask BuildEnv for prior instance of this specific component
+					vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*view.Code)
+					if vgcomp == nil {
+						// create new one if needed
+						vgcomp = new(view.Code)
+						vgin.BuildEnv.WireComponent(vgcomp)
+					}
+					vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+					vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+						vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+						vgout = &vugu.BuildOut{}
+						vgout.Out = append(vgout.Out, vgn)
+						vgparent := vgn
+						_ = vgparent
+
+						vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+						vgparent.AppendChild(vgn)
+						vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "pre", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "style", Val: "margin: 0;"}}}
+						vgparent.AppendChild(vgn)
+						vgn.SetInnerHTML("<input:Button class=\"d3c-color-success\">\n" +
+							"	<vg-slot name=\"SymbolSlot\"><icons:LPlus></icons:LPlus></vg-slot>\n" +
+							"	<vg-slot name=\"DefaultSlot\">Successful action</vg-slot>\n" +
+							"</input:Button>")
+						vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
+						vgparent.AppendChild(vgn)
+						return
+					})
+					vgout.Components = append(vgout.Components, vgcomp)
+					vgn = &vugu.VGNode{Component: vgcomp}
+					vgparent.AppendChild(vgn)
+				}
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
+				vgparent.AppendChild(vgn)
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "div", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "flex-container"}}}
+				vgparent.AppendChild(vgn)
+				{
+					vgparent := vgn
+					_ = vgparent
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+					vgparent.AppendChild(vgn)
+					{
+						vgcompKey := vugu.MakeCompKey(0xF8517568E0FF1157^vgin.CurrentPositionHash(), vgiterkey)
+						// ask BuildEnv for prior instance of this specific component
+						vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*input.Button)
+						if vgcomp == nil {
+							// create new one if needed
+							vgcomp = new(input.Button)
+							vgin.BuildEnv.WireComponent(vgcomp)
+						}
+						vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+						vgcomp.AttrMap = make(map[string]interface{}, 8)
+						vgcomp.AttrMap["class"] = "d3c-color-success"
+						vgcomp.SymbolSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+							vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+							vgout = &vugu.BuildOut{}
+							vgout.Out = append(vgout.Out, vgn)
+							vgparent := vgn
+							_ = vgparent
+
+							{
+								vgcompKey := vugu.MakeCompKey(0xEF81D520239FDEFD^vgin.CurrentPositionHash(), vgiterkey)
+								// ask BuildEnv for prior instance of this specific component
+								vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LPlus)
+								if vgcomp == nil {
+									// create new one if needed
+									vgcomp = new(icons.LPlus)
+									vgin.BuildEnv.WireComponent(vgcomp)
+								}
+								vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+								vgout.Components = append(vgout.Components, vgcomp)
+								vgn = &vugu.VGNode{Component: vgcomp}
+								vgparent.AppendChild(vgn)
+							}
+							return
+						})
+						vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+							vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+							vgout = &vugu.BuildOut{}
+							vgout.Out = append(vgout.Out, vgn)
+							vgparent := vgn
+							_ = vgparent
+
+							vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "Successful action"}
+							vgparent.AppendChild(vgn)
+							return
+						})
+						vgout.Components = append(vgout.Components, vgcomp)
+						vgn = &vugu.VGNode{Component: vgcomp}
+						vgparent.AppendChild(vgn)
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+					vgparent.AppendChild(vgn)
+					{
+						vgcompKey := vugu.MakeCompKey(0x509265E91E53A92E^vgin.CurrentPositionHash(), vgiterkey)
+						// ask BuildEnv for prior instance of this specific component
+						vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*input.Button)
+						if vgcomp == nil {
+							// create new one if needed
+							vgcomp = new(input.Button)
+							vgin.BuildEnv.WireComponent(vgcomp)
+						}
+						vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+						vgcomp.AttrMap = make(map[string]interface{}, 8)
+						vgcomp.AttrMap["class"] = "d3c-color-attention"
+						vgcomp.SymbolSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+							vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+							vgout = &vugu.BuildOut{}
+							vgout.Out = append(vgout.Out, vgn)
+							vgparent := vgn
+							_ = vgparent
+
+							{
+								vgcompKey := vugu.MakeCompKey(0x95A91B5DE270F9CD^vgin.CurrentPositionHash(), vgiterkey)
+								// ask BuildEnv for prior instance of this specific component
+								vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LGlobe)
+								if vgcomp == nil {
+									// create new one if needed
+									vgcomp = new(icons.LGlobe)
+									vgin.BuildEnv.WireComponent(vgcomp)
+								}
+								vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+								vgout.Components = append(vgout.Components, vgcomp)
+								vgn = &vugu.VGNode{Component: vgcomp}
+								vgparent.AppendChild(vgn)
+							}
+							return
+						})
+						vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+							vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+							vgout = &vugu.BuildOut{}
+							vgout.Out = append(vgout.Out, vgn)
+							vgparent := vgn
+							_ = vgparent
+
+							vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "Highlighted action"}
+							vgparent.AppendChild(vgn)
+							return
+						})
+						vgout.Components = append(vgout.Components, vgcomp)
+						vgn = &vugu.VGNode{Component: vgcomp}
+						vgparent.AppendChild(vgn)
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+					vgparent.AppendChild(vgn)
+					{
+						vgcompKey := vugu.MakeCompKey(0x80C1B9354FB20AA8^vgin.CurrentPositionHash(), vgiterkey)
+						// ask BuildEnv for prior instance of this specific component
+						vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*input.Button)
+						if vgcomp == nil {
+							// create new one if needed
+							vgcomp = new(input.Button)
+							vgin.BuildEnv.WireComponent(vgcomp)
+						}
+						vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+						vgcomp.AttrMap = make(map[string]interface{}, 8)
+						vgcomp.AttrMap["class"] = "d3c-color-caution"
+						vgcomp.SymbolSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+							vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+							vgout = &vugu.BuildOut{}
+							vgout.Out = append(vgout.Out, vgn)
+							vgparent := vgn
+							_ = vgparent
+
+							{
+								vgcompKey := vugu.MakeCompKey(0x70AA579EE85A4D87^vgin.CurrentPositionHash(), vgiterkey)
+								// ask BuildEnv for prior instance of this specific component
+								vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LInfoCircle)
+								if vgcomp == nil {
+									// create new one if needed
+									vgcomp = new(icons.LInfoCircle)
+									vgin.BuildEnv.WireComponent(vgcomp)
+								}
+								vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+								vgout.Components = append(vgout.Components, vgcomp)
+								vgn = &vugu.VGNode{Component: vgcomp}
+								vgparent.AppendChild(vgn)
+							}
+							return
+						})
+						vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+							vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+							vgout = &vugu.BuildOut{}
+							vgout.Out = append(vgout.Out, vgn)
+							vgparent := vgn
+							_ = vgparent
+
+							vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "Press with caution"}
+							vgparent.AppendChild(vgn)
+							return
+						})
+						vgout.Components = append(vgout.Components, vgcomp)
+						vgn = &vugu.VGNode{Component: vgcomp}
+						vgparent.AppendChild(vgn)
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+					vgparent.AppendChild(vgn)
+					{
+						vgcompKey := vugu.MakeCompKey(0xF82A1D4E0293E19E^vgin.CurrentPositionHash(), vgiterkey)
+						// ask BuildEnv for prior instance of this specific component
+						vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*input.Button)
+						if vgcomp == nil {
+							// create new one if needed
+							vgcomp = new(input.Button)
+							vgin.BuildEnv.WireComponent(vgcomp)
+						}
+						vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+						vgcomp.AttrMap = make(map[string]interface{}, 8)
+						vgcomp.AttrMap["class"] = "d3c-color-critical"
+						vgcomp.SymbolSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+							vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+							vgout = &vugu.BuildOut{}
+							vgout.Out = append(vgout.Out, vgn)
+							vgparent := vgn
+							_ = vgparent
+
+							{
+								vgcompKey := vugu.MakeCompKey(0xCDF3F2836C88CBDE^vgin.CurrentPositionHash(), vgiterkey)
+								// ask BuildEnv for prior instance of this specific component
+								vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LWarning)
+								if vgcomp == nil {
+									// create new one if needed
+									vgcomp = new(icons.LWarning)
+									vgin.BuildEnv.WireComponent(vgcomp)
+								}
+								vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+								vgout.Components = append(vgout.Components, vgcomp)
+								vgn = &vugu.VGNode{Component: vgcomp}
+								vgparent.AppendChild(vgn)
+							}
+							return
+						})
+						vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+							vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+							vgout = &vugu.BuildOut{}
+							vgout.Out = append(vgout.Out, vgn)
+							vgparent := vgn
+							_ = vgparent
+
+							vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "Dangerous action"}
+							vgparent.AppendChild(vgn)
+							return
+						})
+						vgout.Components = append(vgout.Components, vgcomp)
+						vgn = &vugu.VGNode{Component: vgcomp}
+						vgparent.AppendChild(vgn)
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
+					vgparent.AppendChild(vgn)
+				}
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
+				vgparent.AppendChild(vgn)
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "div", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "flex-container"}}}
+				vgparent.AppendChild(vgn)
+				{
+					vgparent := vgn
+					_ = vgparent
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+					vgparent.AppendChild(vgn)
+					{
+						vgcompKey := vugu.MakeCompKey(0x408D03855CCE84C0^vgin.CurrentPositionHash(), vgiterkey)
+						// ask BuildEnv for prior instance of this specific component
+						vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*input.Button)
+						if vgcomp == nil {
+							// create new one if needed
+							vgcomp = new(input.Button)
+							vgin.BuildEnv.WireComponent(vgcomp)
+						}
+						vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+						vgcomp.AttrMap = make(map[string]interface{}, 8)
+						vgcomp.AttrMap["class"] = "d3c-color-success-faded"
+						vgcomp.SymbolSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+							vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+							vgout = &vugu.BuildOut{}
+							vgout.Out = append(vgout.Out, vgn)
+							vgparent := vgn
+							_ = vgparent
+
+							{
+								vgcompKey := vugu.MakeCompKey(0x3DFFAA9A7AE85711^vgin.CurrentPositionHash(), vgiterkey)
+								// ask BuildEnv for prior instance of this specific component
+								vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LPlus)
+								if vgcomp == nil {
+									// create new one if needed
+									vgcomp = new(icons.LPlus)
+									vgin.BuildEnv.WireComponent(vgcomp)
+								}
+								vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+								vgout.Components = append(vgout.Components, vgcomp)
+								vgn = &vugu.VGNode{Component: vgcomp}
+								vgparent.AppendChild(vgn)
+							}
+							return
+						})
+						vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+							vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+							vgout = &vugu.BuildOut{}
+							vgout.Out = append(vgout.Out, vgn)
+							vgparent := vgn
+							_ = vgparent
+
+							vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "Successful action"}
+							vgparent.AppendChild(vgn)
+							return
+						})
+						vgout.Components = append(vgout.Components, vgcomp)
+						vgn = &vugu.VGNode{Component: vgcomp}
+						vgparent.AppendChild(vgn)
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+					vgparent.AppendChild(vgn)
+					{
+						vgcompKey := vugu.MakeCompKey(0x7A7688DB8ACF6DD^vgin.CurrentPositionHash(), vgiterkey)
+						// ask BuildEnv for prior instance of this specific component
+						vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*input.Button)
+						if vgcomp == nil {
+							// create new one if needed
+							vgcomp = new(input.Button)
+							vgin.BuildEnv.WireComponent(vgcomp)
+						}
+						vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+						vgcomp.AttrMap = make(map[string]interface{}, 8)
+						vgcomp.AttrMap["class"] = "d3c-color-attention-faded"
+						vgcomp.SymbolSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+							vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+							vgout = &vugu.BuildOut{}
+							vgout.Out = append(vgout.Out, vgn)
+							vgparent := vgn
+							_ = vgparent
+
+							{
+								vgcompKey := vugu.MakeCompKey(0xAB997A0C605FC192^vgin.CurrentPositionHash(), vgiterkey)
+								// ask BuildEnv for prior instance of this specific component
+								vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LGlobe)
+								if vgcomp == nil {
+									// create new one if needed
+									vgcomp = new(icons.LGlobe)
+									vgin.BuildEnv.WireComponent(vgcomp)
+								}
+								vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+								vgout.Components = append(vgout.Components, vgcomp)
+								vgn = &vugu.VGNode{Component: vgcomp}
+								vgparent.AppendChild(vgn)
+							}
+							return
+						})
+						vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+							vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+							vgout = &vugu.BuildOut{}
+							vgout.Out = append(vgout.Out, vgn)
+							vgparent := vgn
+							_ = vgparent
+
+							vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "Highlighted action"}
+							vgparent.AppendChild(vgn)
+							return
+						})
+						vgout.Components = append(vgout.Components, vgcomp)
+						vgn = &vugu.VGNode{Component: vgcomp}
+						vgparent.AppendChild(vgn)
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+					vgparent.AppendChild(vgn)
+					{
+						vgcompKey := vugu.MakeCompKey(0xDA589619C1A910AF^vgin.CurrentPositionHash(), vgiterkey)
+						// ask BuildEnv for prior instance of this specific component
+						vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*input.Button)
+						if vgcomp == nil {
+							// create new one if needed
+							vgcomp = new(input.Button)
+							vgin.BuildEnv.WireComponent(vgcomp)
+						}
+						vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+						vgcomp.AttrMap = make(map[string]interface{}, 8)
+						vgcomp.AttrMap["class"] = "d3c-color-caution-faded"
+						vgcomp.SymbolSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+							vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+							vgout = &vugu.BuildOut{}
+							vgout.Out = append(vgout.Out, vgn)
+							vgparent := vgn
+							_ = vgparent
+
+							{
+								vgcompKey := vugu.MakeCompKey(0xDB2DED6F58782F3F^vgin.CurrentPositionHash(), vgiterkey)
+								// ask BuildEnv for prior instance of this specific component
+								vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LInfoCircle)
+								if vgcomp == nil {
+									// create new one if needed
+									vgcomp = new(icons.LInfoCircle)
+									vgin.BuildEnv.WireComponent(vgcomp)
+								}
+								vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+								vgout.Components = append(vgout.Components, vgcomp)
+								vgn = &vugu.VGNode{Component: vgcomp}
+								vgparent.AppendChild(vgn)
+							}
+							return
+						})
+						vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+							vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+							vgout = &vugu.BuildOut{}
+							vgout.Out = append(vgout.Out, vgn)
+							vgparent := vgn
+							_ = vgparent
+
+							vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "Press with caution"}
+							vgparent.AppendChild(vgn)
+							return
+						})
+						vgout.Components = append(vgout.Components, vgcomp)
+						vgn = &vugu.VGNode{Component: vgcomp}
+						vgparent.AppendChild(vgn)
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+					vgparent.AppendChild(vgn)
+					{
+						vgcompKey := vugu.MakeCompKey(0xB2A5BE9FEFEA7F3B^vgin.CurrentPositionHash(), vgiterkey)
+						// ask BuildEnv for prior instance of this specific component
+						vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*input.Button)
+						if vgcomp == nil {
+							// create new one if needed
+							vgcomp = new(input.Button)
+							vgin.BuildEnv.WireComponent(vgcomp)
+						}
+						vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+						vgcomp.AttrMap = make(map[string]interface{}, 8)
+						vgcomp.AttrMap["class"] = "d3c-color-critical-faded"
+						vgcomp.SymbolSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+							vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+							vgout = &vugu.BuildOut{}
+							vgout.Out = append(vgout.Out, vgn)
+							vgparent := vgn
+							_ = vgparent
+
+							{
+								vgcompKey := vugu.MakeCompKey(0xF2F60EC9FFE96B00^vgin.CurrentPositionHash(), vgiterkey)
+								// ask BuildEnv for prior instance of this specific component
+								vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LWarning)
+								if vgcomp == nil {
+									// create new one if needed
+									vgcomp = new(icons.LWarning)
+									vgin.BuildEnv.WireComponent(vgcomp)
+								}
+								vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+								vgout.Components = append(vgout.Components, vgcomp)
+								vgn = &vugu.VGNode{Component: vgcomp}
+								vgparent.AppendChild(vgn)
+							}
+							return
+						})
+						vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+							vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+							vgout = &vugu.BuildOut{}
+							vgout.Out = append(vgout.Out, vgn)
+							vgparent := vgn
+							_ = vgparent
+
+							vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "Dangerous action"}
+							vgparent.AppendChild(vgn)
+							return
+						})
+						vgout.Components = append(vgout.Components, vgcomp)
+						vgn = &vugu.VGNode{Component: vgcomp}
+						vgparent.AppendChild(vgn)
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
+					vgparent.AppendChild(vgn)
+				}
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\n\t\t"}
+				vgparent.AppendChild(vgn)
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "h2", Attr: []vugu.VGAttribute(nil)}
+				vgparent.AppendChild(vgn)
+				vgn.SetInnerHTML(vugu.HTML("Tags"))
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
+				vgparent.AppendChild(vgn)
+				{
+					vgcompKey := vugu.MakeCompKey(0x607714A66D9B2DB2^vgin.CurrentPositionHash(), vgiterkey)
+					// ask BuildEnv for prior instance of this specific component
+					vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*view.Code)
+					if vgcomp == nil {
+						// create new one if needed
+						vgcomp = new(view.Code)
+						vgin.BuildEnv.WireComponent(vgcomp)
+					}
+					vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+					vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+						vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+						vgout = &vugu.BuildOut{}
+						vgout.Out = append(vgout.Out, vgn)
+						vgparent := vgn
+						_ = vgparent
+
+						vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+						vgparent.AppendChild(vgn)
+						vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "pre", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "style", Val: "margin: 0;"}}}
+						vgparent.AppendChild(vgn)
+						vgn.SetInnerHTML("<view:Tag class=\"d3c-color-success\">This was a success</view:Tag>")
+						vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
+						vgparent.AppendChild(vgn)
+						return
+					})
+					vgout.Components = append(vgout.Components, vgcomp)
+					vgn = &vugu.VGNode{Component: vgcomp}
+					vgparent.AppendChild(vgn)
+				}
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
+				vgparent.AppendChild(vgn)
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "div", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "flex-container"}}}
+				vgparent.AppendChild(vgn)
+				{
+					vgparent := vgn
+					_ = vgparent
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+					vgparent.AppendChild(vgn)
+					{
+						vgcompKey := vugu.MakeCompKey(0xA067280BC55831E0^vgin.CurrentPositionHash(), vgiterkey)
+						// ask BuildEnv for prior instance of this specific component
+						vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*view.Tag)
+						if vgcomp == nil {
+							// create new one if needed
+							vgcomp = new(view.Tag)
+							vgin.BuildEnv.WireComponent(vgcomp)
+						}
+						vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+						vgcomp.AttrMap = make(map[string]interface{}, 8)
+						vgcomp.AttrMap["class"] = "d3c-color-success"
+						vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+							vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+							vgout = &vugu.BuildOut{}
+							vgout.Out = append(vgout.Out, vgn)
+							vgparent := vgn
+							_ = vgparent
+
+							vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "This was a success"}
+							vgparent.AppendChild(vgn)
+							return
+						})
+						vgout.Components = append(vgout.Components, vgcomp)
+						vgn = &vugu.VGNode{Component: vgcomp}
+						vgparent.AppendChild(vgn)
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+					vgparent.AppendChild(vgn)
+					{
+						vgcompKey := vugu.MakeCompKey(0xD5C3BFBAC4B1B9D5^vgin.CurrentPositionHash(), vgiterkey)
+						// ask BuildEnv for prior instance of this specific component
+						vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*view.Tag)
+						if vgcomp == nil {
+							// create new one if needed
+							vgcomp = new(view.Tag)
+							vgin.BuildEnv.WireComponent(vgcomp)
+						}
+						vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+						vgcomp.AttrMap = make(map[string]interface{}, 8)
+						vgcomp.AttrMap["class"] = "d3c-color-attention"
+						vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+							vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+							vgout = &vugu.BuildOut{}
+							vgout.Out = append(vgout.Out, vgn)
+							vgparent := vgn
+							_ = vgparent
+
+							vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "Attention needed"}
+							vgparent.AppendChild(vgn)
+							return
+						})
+						vgout.Components = append(vgout.Components, vgcomp)
+						vgn = &vugu.VGNode{Component: vgcomp}
+						vgparent.AppendChild(vgn)
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+					vgparent.AppendChild(vgn)
+					{
+						vgcompKey := vugu.MakeCompKey(0x89626A693D351688^vgin.CurrentPositionHash(), vgiterkey)
+						// ask BuildEnv for prior instance of this specific component
+						vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*view.Tag)
+						if vgcomp == nil {
+							// create new one if needed
+							vgcomp = new(view.Tag)
+							vgin.BuildEnv.WireComponent(vgcomp)
+						}
+						vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+						vgcomp.AttrMap = make(map[string]interface{}, 8)
+						vgcomp.AttrMap["class"] = "d3c-color-caution"
+						vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+							vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+							vgout = &vugu.BuildOut{}
+							vgout.Out = append(vgout.Out, vgn)
+							vgparent := vgn
+							_ = vgparent
+
+							vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "Warning"}
+							vgparent.AppendChild(vgn)
+							return
+						})
+						vgout.Components = append(vgout.Components, vgcomp)
+						vgn = &vugu.VGNode{Component: vgcomp}
+						vgparent.AppendChild(vgn)
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+					vgparent.AppendChild(vgn)
+					{
+						vgcompKey := vugu.MakeCompKey(0x30804B131CFE04B2^vgin.CurrentPositionHash(), vgiterkey)
+						// ask BuildEnv for prior instance of this specific component
+						vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*view.Tag)
+						if vgcomp == nil {
+							// create new one if needed
+							vgcomp = new(view.Tag)
+							vgin.BuildEnv.WireComponent(vgcomp)
+						}
+						vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+						vgcomp.AttrMap = make(map[string]interface{}, 8)
+						vgcomp.AttrMap["class"] = "d3c-color-critical"
+						vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+							vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+							vgout = &vugu.BuildOut{}
+							vgout.Out = append(vgout.Out, vgn)
+							vgparent := vgn
+							_ = vgparent
+
+							vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "Something went wrong"}
+							vgparent.AppendChild(vgn)
+							return
+						})
+						vgout.Components = append(vgout.Components, vgcomp)
+						vgn = &vugu.VGNode{Component: vgcomp}
+						vgparent.AppendChild(vgn)
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
+					vgparent.AppendChild(vgn)
+				}
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
+				vgparent.AppendChild(vgn)
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "div", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "flex-container"}}}
+				vgparent.AppendChild(vgn)
+				{
+					vgparent := vgn
+					_ = vgparent
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+					vgparent.AppendChild(vgn)
+					{
+						vgcompKey := vugu.MakeCompKey(0x3268B912C310EF65^vgin.CurrentPositionHash(), vgiterkey)
+						// ask BuildEnv for prior instance of this specific component
+						vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*view.Tag)
+						if vgcomp == nil {
+							// create new one if needed
+							vgcomp = new(view.Tag)
+							vgin.BuildEnv.WireComponent(vgcomp)
+						}
+						vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+						vgcomp.AttrMap = make(map[string]interface{}, 8)
+						vgcomp.AttrMap["class"] = "d3c-color-success-faded"
+						vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+							vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+							vgout = &vugu.BuildOut{}
+							vgout.Out = append(vgout.Out, vgn)
+							vgparent := vgn
+							_ = vgparent
+
+							vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "This was a success"}
+							vgparent.AppendChild(vgn)
+							return
+						})
+						vgout.Components = append(vgout.Components, vgcomp)
+						vgn = &vugu.VGNode{Component: vgcomp}
+						vgparent.AppendChild(vgn)
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+					vgparent.AppendChild(vgn)
+					{
+						vgcompKey := vugu.MakeCompKey(0x667B924244433691^vgin.CurrentPositionHash(), vgiterkey)
+						// ask BuildEnv for prior instance of this specific component
+						vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*view.Tag)
+						if vgcomp == nil {
+							// create new one if needed
+							vgcomp = new(view.Tag)
+							vgin.BuildEnv.WireComponent(vgcomp)
+						}
+						vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+						vgcomp.AttrMap = make(map[string]interface{}, 8)
+						vgcomp.AttrMap["class"] = "d3c-color-attention-faded"
+						vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+							vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+							vgout = &vugu.BuildOut{}
+							vgout.Out = append(vgout.Out, vgn)
+							vgparent := vgn
+							_ = vgparent
+
+							vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "Attention needed"}
+							vgparent.AppendChild(vgn)
+							return
+						})
+						vgout.Components = append(vgout.Components, vgcomp)
+						vgn = &vugu.VGNode{Component: vgcomp}
+						vgparent.AppendChild(vgn)
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+					vgparent.AppendChild(vgn)
+					{
+						vgcompKey := vugu.MakeCompKey(0x5A4DC942965685A0^vgin.CurrentPositionHash(), vgiterkey)
+						// ask BuildEnv for prior instance of this specific component
+						vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*view.Tag)
+						if vgcomp == nil {
+							// create new one if needed
+							vgcomp = new(view.Tag)
+							vgin.BuildEnv.WireComponent(vgcomp)
+						}
+						vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+						vgcomp.AttrMap = make(map[string]interface{}, 8)
+						vgcomp.AttrMap["class"] = "d3c-color-caution-faded"
+						vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+							vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+							vgout = &vugu.BuildOut{}
+							vgout.Out = append(vgout.Out, vgn)
+							vgparent := vgn
+							_ = vgparent
+
+							vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "Warning"}
+							vgparent.AppendChild(vgn)
+							return
+						})
+						vgout.Components = append(vgout.Components, vgcomp)
+						vgn = &vugu.VGNode{Component: vgcomp}
+						vgparent.AppendChild(vgn)
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+					vgparent.AppendChild(vgn)
+					{
+						vgcompKey := vugu.MakeCompKey(0xE839EFE2579C42C4^vgin.CurrentPositionHash(), vgiterkey)
+						// ask BuildEnv for prior instance of this specific component
+						vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*view.Tag)
+						if vgcomp == nil {
+							// create new one if needed
+							vgcomp = new(view.Tag)
+							vgin.BuildEnv.WireComponent(vgcomp)
+						}
+						vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+						vgcomp.AttrMap = make(map[string]interface{}, 8)
+						vgcomp.AttrMap["class"] = "d3c-color-critical-faded"
+						vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+							vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+							vgout = &vugu.BuildOut{}
+							vgout.Out = append(vgout.Out, vgn)
+							vgparent := vgn
+							_ = vgparent
+
+							vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "Something went wrong"}
+							vgparent.AppendChild(vgn)
+							return
+						})
+						vgout.Components = append(vgout.Components, vgcomp)
+						vgn = &vugu.VGNode{Component: vgcomp}
+						vgparent.AppendChild(vgn)
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
+					vgparent.AppendChild(vgn)
+				}
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\n\t\t"}
+				vgparent.AppendChild(vgn)
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "h2", Attr: []vugu.VGAttribute(nil)}
+				vgparent.AppendChild(vgn)
+				vgn.SetInnerHTML(vugu.HTML("Icons"))
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
+				vgparent.AppendChild(vgn)
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "p", Attr: []vugu.VGAttribute(nil)}
+				vgparent.AppendChild(vgn)
+				{
+					vgparent := vgn
+					_ = vgparent
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "Icons will use the text color by default, if you need to change their stroke/fill coloring, use the "}
+					vgparent.AppendChild(vgn)
+					{
+						vgcompKey := vugu.MakeCompKey(0xEF2406F7CF2D88ED^vgin.CurrentPositionHash(), vgiterkey)
+						// ask BuildEnv for prior instance of this specific component
+						vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*view.CodeInline)
+						if vgcomp == nil {
+							// create new one if needed
+							vgcomp = new(view.CodeInline)
+							vgin.BuildEnv.WireComponent(vgcomp)
+						}
+						vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+						vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+							vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+							vgout = &vugu.BuildOut{}
+							vgout.Out = append(vgout.Out, vgn)
+							vgparent := vgn
+							_ = vgparent
+
+							vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "d3c-icon-use-color"}
+							vgparent.AppendChild(vgn)
+							return
+						})
+						vgout.Components = append(vgout.Components, vgcomp)
+						vgn = &vugu.VGNode{Component: vgcomp}
+						vgparent.AppendChild(vgn)
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: " class."}
+					vgparent.AppendChild(vgn)
+				}
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
+				vgparent.AppendChild(vgn)
+				{
+					vgcompKey := vugu.MakeCompKey(0xA894B451395FF4FD^vgin.CurrentPositionHash(), vgiterkey)
+					// ask BuildEnv for prior instance of this specific component
+					vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*view.Code)
+					if vgcomp == nil {
+						// create new one if needed
+						vgcomp = new(view.Code)
+						vgin.BuildEnv.WireComponent(vgcomp)
+					}
+					vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+					vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+						vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+						vgout = &vugu.BuildOut{}
+						vgout.Out = append(vgout.Out, vgn)
+						vgparent := vgn
+						_ = vgparent
+
+						vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+						vgparent.AppendChild(vgn)
+						vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "pre", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "style", Val: "margin: 0;"}}}
+						vgparent.AppendChild(vgn)
+						vgn.SetInnerHTML("<icons:LInfoCircle class=\"d3c-color-attention d3c-icon-use-color\"></icons:LInfoCircle>")
+						vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
+						vgparent.AppendChild(vgn)
+						return
+					})
+					vgout.Components = append(vgout.Components, vgcomp)
+					vgn = &vugu.VGNode{Component: vgcomp}
+					vgparent.AppendChild(vgn)
+				}
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
+				vgparent.AppendChild(vgn)
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "div", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "flex-container"}, vugu.VGAttribute{Namespace: "", Key: "style", Val: "font-size: 2em;"}}}
+				vgparent.AppendChild(vgn)
+				{
+					vgparent := vgn
+					_ = vgparent
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+					vgparent.AppendChild(vgn)
+					{
+						vgcompKey := vugu.MakeCompKey(0xDE8FBA53046FE12C^vgin.CurrentPositionHash(), vgiterkey)
+						// ask BuildEnv for prior instance of this specific component
+						vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LInfoCircle)
+						if vgcomp == nil {
+							// create new one if needed
+							vgcomp = new(icons.LInfoCircle)
+							vgin.BuildEnv.WireComponent(vgcomp)
+						}
+						vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+						vgcomp.AttrMap = make(map[string]interface{}, 8)
+						vgcomp.AttrMap["class"] = "d3c-color-attention d3c-icon-use-color"
+						vgout.Components = append(vgout.Components, vgcomp)
+						vgn = &vugu.VGNode{Component: vgcomp}
+						vgparent.AppendChild(vgn)
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+					vgparent.AppendChild(vgn)
+					{
+						vgcompKey := vugu.MakeCompKey(0x6674A40D598581A5^vgin.CurrentPositionHash(), vgiterkey)
+						// ask BuildEnv for prior instance of this specific component
+						vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LWarning)
+						if vgcomp == nil {
+							// create new one if needed
+							vgcomp = new(icons.LWarning)
+							vgin.BuildEnv.WireComponent(vgcomp)
+						}
+						vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+						vgcomp.AttrMap = make(map[string]interface{}, 8)
+						vgcomp.AttrMap["class"] = "d3c-color-critical d3c-icon-use-color"
+						vgout.Components = append(vgout.Components, vgcomp)
+						vgn = &vugu.VGNode{Component: vgcomp}
+						vgparent.AppendChild(vgn)
+					}
+					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
+					vgparent.AppendChild(vgn)
+				}
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\n\t\t"}
+				vgparent.AppendChild(vgn)
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "h2", Attr: []vugu.VGAttribute(nil)}
+				vgparent.AppendChild(vgn)
+				vgn.SetInnerHTML(vugu.HTML("Containers"))
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
+				vgparent.AppendChild(vgn)
+				{
+					vgcompKey := vugu.MakeCompKey(0x3AA895586257C72D^vgin.CurrentPositionHash(), vgiterkey)
+					// ask BuildEnv for prior instance of this specific component
+					vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*layout.LayerContainer)
+					if vgcomp == nil {
+						// create new one if needed
+						vgcomp = new(layout.LayerContainer)
+						vgin.BuildEnv.WireComponent(vgcomp)
+					}
+					vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+					vgcomp.AttrMap = make(map[string]interface{}, 8)
+					vgcomp.AttrMap["class"] = "d3c-color-layer-1"
+					vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+						vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+						vgout = &vugu.BuildOut{}
+						vgout.Out = append(vgout.Out, vgn)
+						vgparent := vgn
+						_ = vgparent
+
+						vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+						vgparent.AppendChild(vgn)
+						vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "span", Attr: []vugu.VGAttribute(nil)}
+						vgparent.AppendChild(vgn)
+						{
+							vgparent := vgn
+							_ = vgparent
+							vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "This container uses the "}
+							vgparent.AppendChild(vgn)
+							{
+								vgcompKey := vugu.MakeCompKey(0x1CE406899FE4A4E0^vgin.CurrentPositionHash(), vgiterkey)
+								// ask BuildEnv for prior instance of this specific component
+								vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*view.CodeInline)
+								if vgcomp == nil {
+									// create new one if needed
+									vgcomp = new(view.CodeInline)
+									vgin.BuildEnv.WireComponent(vgcomp)
+								}
+								vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+								vgcomp.AttrMap = make(map[string]interface{}, 8)
+								vgcomp.AttrMap["class"] = "d3c-color-layer-2"
+								vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+									vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+									vgout = &vugu.BuildOut{}
+									vgout.Out = append(vgout.Out, vgn)
+									vgparent := vgn
+									_ = vgparent
+
+									vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "d3c-color-layer-1"}
+									vgparent.AppendChild(vgn)
+									return
+								})
+								vgout.Components = append(vgout.Components, vgcomp)
+								vgn = &vugu.VGNode{Component: vgcomp}
+								vgparent.AppendChild(vgn)
+							}
+							vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: " class. All child elements inherit the color scheme."}
+							vgparent.AppendChild(vgn)
+						}
+						vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+						vgparent.AppendChild(vgn)
+						{
+							vgcompKey := vugu.MakeCompKey(0xBB0B755FAE964ED5^vgin.CurrentPositionHash(), vgiterkey)
+							// ask BuildEnv for prior instance of this specific component
+							vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*input.Button)
+							if vgcomp == nil {
+								// create new one if needed
+								vgcomp = new(input.Button)
+								vgin.BuildEnv.WireComponent(vgcomp)
+							}
+							vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+							vgcomp.SymbolSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+								vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+								vgout = &vugu.BuildOut{}
+								vgout.Out = append(vgout.Out, vgn)
+								vgparent := vgn
+								_ = vgparent
+
+								{
+									vgcompKey := vugu.MakeCompKey(0x2A2E33F489150551^vgin.CurrentPositionHash(), vgiterkey)
+									// ask BuildEnv for prior instance of this specific component
+									vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LPlus)
+									if vgcomp == nil {
+										// create new one if needed
+										vgcomp = new(icons.LPlus)
+										vgin.BuildEnv.WireComponent(vgcomp)
+									}
+									vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+									vgout.Components = append(vgout.Components, vgcomp)
+									vgn = &vugu.VGNode{Component: vgcomp}
+									vgparent.AppendChild(vgn)
+								}
+								return
+							})
+							vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+								vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+								vgout = &vugu.BuildOut{}
+								vgout.Out = append(vgout.Out, vgn)
+								vgparent := vgn
+								_ = vgparent
+
+								vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "Does inherit color"}
+								vgparent.AppendChild(vgn)
+								return
+							})
+							vgout.Components = append(vgout.Components, vgcomp)
+							vgn = &vugu.VGNode{Component: vgcomp}
+							vgparent.AppendChild(vgn)
+						}
+						vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+						vgparent.AppendChild(vgn)
+						{
+							vgcompKey := vugu.MakeCompKey(0xBA59049FDD52F591^vgin.CurrentPositionHash(), vgiterkey)
+							// ask BuildEnv for prior instance of this specific component
+							vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*input.Button)
+							if vgcomp == nil {
+								// create new one if needed
+								vgcomp = new(input.Button)
+								vgin.BuildEnv.WireComponent(vgcomp)
+							}
+							vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+							vgcomp.AttrMap = make(map[string]interface{}, 8)
+							vgcomp.AttrMap["class"] = "d3c-color-layer-0"
+							vgcomp.SymbolSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+								vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+								vgout = &vugu.BuildOut{}
+								vgout.Out = append(vgout.Out, vgn)
+								vgparent := vgn
+								_ = vgparent
+
+								{
+									vgcompKey := vugu.MakeCompKey(0x14864659B38F25DF^vgin.CurrentPositionHash(), vgiterkey)
+									// ask BuildEnv for prior instance of this specific component
+									vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LPlus)
+									if vgcomp == nil {
+										// create new one if needed
+										vgcomp = new(icons.LPlus)
+										vgin.BuildEnv.WireComponent(vgcomp)
+									}
+									vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+									vgout.Components = append(vgout.Components, vgcomp)
+									vgn = &vugu.VGNode{Component: vgcomp}
+									vgparent.AppendChild(vgn)
+								}
+								return
+							})
+							vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+								vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+								vgout = &vugu.BuildOut{}
+								vgout.Out = append(vgout.Out, vgn)
+								vgparent := vgn
+								_ = vgparent
+
+								vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "Doesn't inherit color"}
+								vgparent.AppendChild(vgn)
+								return
+							})
+							vgout.Components = append(vgout.Components, vgcomp)
+							vgn = &vugu.VGNode{Component: vgcomp}
+							vgparent.AppendChild(vgn)
+						}
+						vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
+						vgparent.AppendChild(vgn)
+						return
+					})
+					vgout.Components = append(vgout.Components, vgcomp)
+					vgn = &vugu.VGNode{Component: vgcomp}
+					vgparent.AppendChild(vgn)
+				}
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
+				vgparent.AppendChild(vgn)
+				{
+					vgcompKey := vugu.MakeCompKey(0x5A6CB04F67B5B741^vgin.CurrentPositionHash(), vgiterkey)
+					// ask BuildEnv for prior instance of this specific component
+					vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*layout.LayerContainer)
+					if vgcomp == nil {
+						// create new one if needed
+						vgcomp = new(layout.LayerContainer)
+						vgin.BuildEnv.WireComponent(vgcomp)
+					}
+					vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+					vgcomp.AttrMap = make(map[string]interface{}, 8)
+					vgcomp.AttrMap["class"] = "d3c-color-critical-faded"
+					vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+						vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+						vgout = &vugu.BuildOut{}
+						vgout.Out = append(vgout.Out, vgn)
+						vgparent := vgn
+						_ = vgparent
+
+						vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+						vgparent.AppendChild(vgn)
+						{
+							vgcompKey := vugu.MakeCompKey(0x49633A4A30E7190^vgin.CurrentPositionHash(), vgiterkey)
+							// ask BuildEnv for prior instance of this specific component
+							vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LWarning)
+							if vgcomp == nil {
+								// create new one if needed
+								vgcomp = new(icons.LWarning)
+								vgin.BuildEnv.WireComponent(vgcomp)
+							}
+							vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+							vgout.Components = append(vgout.Components, vgcomp)
+							vgn = &vugu.VGNode{Component: vgcomp}
+							vgparent.AppendChild(vgn)
+						}
+						vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: " "}
+						vgparent.AppendChild(vgn)
+						vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "span", Attr: []vugu.VGAttribute(nil)}
+						vgparent.AppendChild(vgn)
+						vgn.SetInnerHTML(vugu.HTML("Something bad happened!"))
+						vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
+						vgparent.AppendChild(vgn)
+						return
+					})
+					vgout.Components = append(vgout.Components, vgcomp)
+					vgn = &vugu.VGNode{Component: vgcomp}
+					vgparent.AppendChild(vgn)
+				}
+				vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
+				vgparent.AppendChild(vgn)
+				return
+			})
+			vgout.Components = append(vgout.Components, vgcomp)
+			vgn = &vugu.VGNode{Component: vgcomp}
+			vgparent.AppendChild(vgn)
+		}
+		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n"}
+		vgparent.AppendChild(vgn)
+	}
+	vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Data: "style", Attr: []vugu.VGAttribute(nil)}
+	{
+		vgn.AppendChild(&vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t.flex-container {\n\t\tmargin: 0.5em 0;\n\t\tdisplay: flex;\n\t\tflex-wrap: wrap;\n\t\tgap: 0.5em;\n\t}\n\n\t.flex-container > * {\n\t\tmargin: 0;\n\t}\n", Attr: []vugu.VGAttribute(nil)})
+	}
+	vgout.AppendCSS(vgn)
+	return vgout
+}
+
+// 'fix' unused imports
+var _ fmt.Stringer
+var _ reflect.Type
+var _ vjson.RawMessage
+var _ js.Value
diff --git a/page-home.vugu b/page-home.vugu
index 413c176..189f2d5 100644
--- a/page-home.vugu
+++ b/page-home.vugu
@@ -25,11 +25,11 @@
 		This is some tag: <view:Tag>Some Tag</view:Tag> and <view:Tag>Another Tag</view:Tag>
 		<h2>List Container</h2>
 		<layout:ListContainer>
-			<div vg-for="i := 0; i < 5; i++" class="list-item">
+			<layout:LayerContainer vg-for="i := 0; i < 5; i++" class="list-item d3c-color-layer-1">
 				<icons:LInfoCircle></icons:LInfoCircle>
 				<div vg-content="i"></div>
 				<div>Some Content!</div>
-			</div>
+			</layout:LayerContainer>
 		</layout:ListContainer>
 		<h2>Navigation buttons</h2>
 		<div style="display: flex; flex-wrap: wrap; gap: 0.5em; margin: 0.5em 0;">
diff --git a/page-home_vgen.go b/page-home_vgen.go
index 22b822e..13e3060 100644
--- a/page-home_vgen.go
+++ b/page-home_vgen.go
@@ -32,7 +32,7 @@ func (c *PageHome) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x1991362EB4023644^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0xF531C1D165C4C2F2^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*layout.Container)
 			if vgcomp == nil {
@@ -61,7 +61,7 @@ func (c *PageHome) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 				vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
 				vgparent.AppendChild(vgn)
 				{
-					vgcompKey := vugu.MakeCompKey(0x90304D7C50E84446^vgin.CurrentPositionHash(), vgiterkey)
+					vgcompKey := vugu.MakeCompKey(0x3707ED30B0ED2538^vgin.CurrentPositionHash(), vgiterkey)
 					// ask BuildEnv for prior instance of this specific component
 					vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*view.Code)
 					if vgcomp == nil {
@@ -101,7 +101,7 @@ func (c *PageHome) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 				vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
 				vgparent.AppendChild(vgn)
 				{
-					vgcompKey := vugu.MakeCompKey(0xA0A0B799D39E215^vgin.CurrentPositionHash(), vgiterkey)
+					vgcompKey := vugu.MakeCompKey(0x8CD3BC78E689EBFE^vgin.CurrentPositionHash(), vgiterkey)
 					// ask BuildEnv for prior instance of this specific component
 					vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*input.Button)
 					if vgcomp == nil {
@@ -118,7 +118,7 @@ func (c *PageHome) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 						_ = vgparent
 
 						{
-							vgcompKey := vugu.MakeCompKey(0x6F903202F2F47FD2^vgin.CurrentPositionHash(), vgiterkey)
+							vgcompKey := vugu.MakeCompKey(0x141E5843E8537448^vgin.CurrentPositionHash(), vgiterkey)
 							// ask BuildEnv for prior instance of this specific component
 							vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LGlobe)
 							if vgcomp == nil {
@@ -151,7 +151,7 @@ func (c *PageHome) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 				vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
 				vgparent.AppendChild(vgn)
 				{
-					vgcompKey := vugu.MakeCompKey(0x304A680C9578E96E^vgin.CurrentPositionHash(), vgiterkey)
+					vgcompKey := vugu.MakeCompKey(0x20BE4106CE9EF5E5^vgin.CurrentPositionHash(), vgiterkey)
 					// ask BuildEnv for prior instance of this specific component
 					vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*input.Button)
 					if vgcomp == nil {
@@ -168,7 +168,7 @@ func (c *PageHome) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 						_ = vgparent
 
 						{
-							vgcompKey := vugu.MakeCompKey(0x33866FD9359F33CD^vgin.CurrentPositionHash(), vgiterkey)
+							vgcompKey := vugu.MakeCompKey(0x23A6CE28F2368AD8^vgin.CurrentPositionHash(), vgiterkey)
 							// ask BuildEnv for prior instance of this specific component
 							vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LGlobe)
 							if vgcomp == nil {
@@ -201,7 +201,7 @@ func (c *PageHome) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 				vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
 				vgparent.AppendChild(vgn)
 				{
-					vgcompKey := vugu.MakeCompKey(0xF2B21AEDA668B432^vgin.CurrentPositionHash(), vgiterkey)
+					vgcompKey := vugu.MakeCompKey(0x5EBAC6C1A15BCE78^vgin.CurrentPositionHash(), vgiterkey)
 					// ask BuildEnv for prior instance of this specific component
 					vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*input.Button)
 					if vgcomp == nil {
@@ -218,7 +218,7 @@ func (c *PageHome) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 						_ = vgparent
 
 						{
-							vgcompKey := vugu.MakeCompKey(0x120421935D7B22DA^vgin.CurrentPositionHash(), vgiterkey)
+							vgcompKey := vugu.MakeCompKey(0x69FA09F7AF4D9D19^vgin.CurrentPositionHash(), vgiterkey)
 							// ask BuildEnv for prior instance of this specific component
 							vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LGlobe)
 							if vgcomp == nil {
@@ -258,7 +258,7 @@ func (c *PageHome) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "Some "}
 					vgparent.AppendChild(vgn)
 					{
-						vgcompKey := vugu.MakeCompKey(0xC4C27A6B31811612^vgin.CurrentPositionHash(), vgiterkey)
+						vgcompKey := vugu.MakeCompKey(0xEEE138F1DBAFDD65^vgin.CurrentPositionHash(), vgiterkey)
 						// ask BuildEnv for prior instance of this specific component
 						vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*view.CodeInline)
 						if vgcomp == nil {
@@ -293,7 +293,7 @@ func (c *PageHome) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 				vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\tThis is some tag: "}
 				vgparent.AppendChild(vgn)
 				{
-					vgcompKey := vugu.MakeCompKey(0x4FE1167767DFD155^vgin.CurrentPositionHash(), vgiterkey)
+					vgcompKey := vugu.MakeCompKey(0x9AB9956C2A1986F2^vgin.CurrentPositionHash(), vgiterkey)
 					// ask BuildEnv for prior instance of this specific component
 					vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*view.Tag)
 					if vgcomp == nil {
@@ -320,7 +320,7 @@ func (c *PageHome) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 				vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: " and "}
 				vgparent.AppendChild(vgn)
 				{
-					vgcompKey := vugu.MakeCompKey(0x2E7ECEC8963B39BB^vgin.CurrentPositionHash(), vgiterkey)
+					vgcompKey := vugu.MakeCompKey(0xD6BC59AF1F5B24E0^vgin.CurrentPositionHash(), vgiterkey)
 					// ask BuildEnv for prior instance of this specific component
 					vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*view.Tag)
 					if vgcomp == nil {
@@ -352,7 +352,7 @@ func (c *PageHome) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 				vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
 				vgparent.AppendChild(vgn)
 				{
-					vgcompKey := vugu.MakeCompKey(0xCBABA520512AE4C^vgin.CurrentPositionHash(), vgiterkey)
+					vgcompKey := vugu.MakeCompKey(0xEE4F7DB15D238ED^vgin.CurrentPositionHash(), vgiterkey)
 					// ask BuildEnv for prior instance of this specific component
 					vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*layout.ListContainer)
 					if vgcomp == nil {
@@ -375,38 +375,57 @@ func (c *PageHome) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 							_ = vgiterkey
 							i := i
 							_ = i
-							vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "div", Attr: []vugu.VGAttribute{vugu.VGAttribute{Namespace: "", Key: "class", Val: "list-item"}}}
-							vgparent.AppendChild(vgn)
 							{
-								vgparent := vgn
-								_ = vgparent
-								vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t\t"}
-								vgparent.AppendChild(vgn)
-								{
-									vgcompKey := vugu.MakeCompKey(0x48E0978E1B4BA054^vgin.CurrentPositionHash(), vgiterkey)
-									// ask BuildEnv for prior instance of this specific component
-									vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LInfoCircle)
-									if vgcomp == nil {
-										// create new one if needed
-										vgcomp = new(icons.LInfoCircle)
-										vgin.BuildEnv.WireComponent(vgcomp)
-									}
-									vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
-									vgout.Components = append(vgout.Components, vgcomp)
-									vgn = &vugu.VGNode{Component: vgcomp}
-									vgparent.AppendChild(vgn)
+								vgcompKey := vugu.MakeCompKey(0x4082FE6A7AA86A28^vgin.CurrentPositionHash(), vgiterkey)
+								// ask BuildEnv for prior instance of this specific component
+								vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*layout.LayerContainer)
+								if vgcomp == nil {
+									// create new one if needed
+									vgcomp = new(layout.LayerContainer)
+									vgin.BuildEnv.WireComponent(vgcomp)
 								}
-								vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t\t"}
-								vgparent.AppendChild(vgn)
-								vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "div", Attr: []vugu.VGAttribute(nil)}
-								vgparent.AppendChild(vgn)
-								vgn.SetInnerHTML(i)
-								vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t\t"}
-								vgparent.AppendChild(vgn)
-								vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "div", Attr: []vugu.VGAttribute(nil)}
-								vgparent.AppendChild(vgn)
-								vgn.SetInnerHTML(vugu.HTML("Some Content!"))
-								vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+								vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+								vgcomp.AttrMap = make(map[string]interface{}, 8)
+								vgcomp.AttrMap["class"] = "list-item d3c-color-layer-1"
+								vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+									vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+									vgout = &vugu.BuildOut{}
+									vgout.Out = append(vgout.Out, vgn)
+									vgparent := vgn
+									_ = vgparent
+
+									vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t\t"}
+									vgparent.AppendChild(vgn)
+									{
+										vgcompKey := vugu.MakeCompKey(0xA87B1781EFEBE70F^vgin.CurrentPositionHash(), vgiterkey)
+										// ask BuildEnv for prior instance of this specific component
+										vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LInfoCircle)
+										if vgcomp == nil {
+											// create new one if needed
+											vgcomp = new(icons.LInfoCircle)
+											vgin.BuildEnv.WireComponent(vgcomp)
+										}
+										vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+										vgout.Components = append(vgout.Components, vgcomp)
+										vgn = &vugu.VGNode{Component: vgcomp}
+										vgparent.AppendChild(vgn)
+									}
+									vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t\t"}
+									vgparent.AppendChild(vgn)
+									vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "div", Attr: []vugu.VGAttribute(nil)}
+									vgparent.AppendChild(vgn)
+									vgn.SetInnerHTML(i)
+									vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t\t"}
+									vgparent.AppendChild(vgn)
+									vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "div", Attr: []vugu.VGAttribute(nil)}
+									vgparent.AppendChild(vgn)
+									vgn.SetInnerHTML(vugu.HTML("Some Content!"))
+									vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
+									vgparent.AppendChild(vgn)
+									return
+								})
+								vgout.Components = append(vgout.Components, vgcomp)
+								vgn = &vugu.VGNode{Component: vgcomp}
 								vgparent.AppendChild(vgn)
 							}
 						}
@@ -433,7 +452,7 @@ func (c *PageHome) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
 					vgparent.AppendChild(vgn)
 					{
-						vgcompKey := vugu.MakeCompKey(0x9A435BE1D0AE644C^vgin.CurrentPositionHash(), vgiterkey)
+						vgcompKey := vugu.MakeCompKey(0xC32C7D4AD1821ABD^vgin.CurrentPositionHash(), vgiterkey)
 						// ask BuildEnv for prior instance of this specific component
 						vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*input.Button)
 						if vgcomp == nil {
@@ -453,7 +472,7 @@ func (c *PageHome) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 							_ = vgparent
 
 							{
-								vgcompKey := vugu.MakeCompKey(0xD5F1C32924555E04^vgin.CurrentPositionHash(), vgiterkey)
+								vgcompKey := vugu.MakeCompKey(0xB0F59227BF37587^vgin.CurrentPositionHash(), vgiterkey)
 								// ask BuildEnv for prior instance of this specific component
 								vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LGlobe)
 								if vgcomp == nil {
@@ -488,7 +507,7 @@ func (c *PageHome) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
 					vgparent.AppendChild(vgn)
 					{
-						vgcompKey := vugu.MakeCompKey(0x6FCFF95503C9579A^vgin.CurrentPositionHash(), vgiterkey)
+						vgcompKey := vugu.MakeCompKey(0x4BB86AD8864D78D5^vgin.CurrentPositionHash(), vgiterkey)
 						// ask BuildEnv for prior instance of this specific component
 						vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*input.Button)
 						if vgcomp == nil {
@@ -508,7 +527,7 @@ func (c *PageHome) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 							_ = vgparent
 
 							{
-								vgcompKey := vugu.MakeCompKey(0x13B5178BB56E8497^vgin.CurrentPositionHash(), vgiterkey)
+								vgcompKey := vugu.MakeCompKey(0x24EA51551528EFB4^vgin.CurrentPositionHash(), vgiterkey)
 								// ask BuildEnv for prior instance of this specific component
 								vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LGlobe)
 								if vgcomp == nil {
@@ -543,7 +562,7 @@ func (c *PageHome) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 					vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
 					vgparent.AppendChild(vgn)
 					{
-						vgcompKey := vugu.MakeCompKey(0x4A7B6BC5E51A2F0D^vgin.CurrentPositionHash(), vgiterkey)
+						vgcompKey := vugu.MakeCompKey(0x1EFEF0808C43B0BB^vgin.CurrentPositionHash(), vgiterkey)
 						// ask BuildEnv for prior instance of this specific component
 						vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*input.Button)
 						if vgcomp == nil {
@@ -563,7 +582,7 @@ func (c *PageHome) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 							_ = vgparent
 
 							{
-								vgcompKey := vugu.MakeCompKey(0xE45DD75673661BC5^vgin.CurrentPositionHash(), vgiterkey)
+								vgcompKey := vugu.MakeCompKey(0xA9A8E7806883333D^vgin.CurrentPositionHash(), vgiterkey)
 								// ask BuildEnv for prior instance of this specific component
 								vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LGlobe)
 								if vgcomp == nil {
diff --git a/page-icons_vgen.go b/page-icons_vgen.go
index 3a5124d..750dfca 100644
--- a/page-icons_vgen.go
+++ b/page-icons_vgen.go
@@ -29,7 +29,7 @@ func (c *PageIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0xF0D12EB9889268A5^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x84523BA418D01403^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*layout.Container)
 			if vgcomp == nil {
@@ -58,7 +58,7 @@ func (c *PageIcons) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 				vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
 				vgparent.AppendChild(vgn)
 				{
-					vgcompKey := vugu.MakeCompKey(0x4D0FD740CB3E3960^vgin.CurrentPositionHash(), vgiterkey)
+					vgcompKey := vugu.MakeCompKey(0x2C3B977A3EDE76F6^vgin.CurrentPositionHash(), vgiterkey)
 					// ask BuildEnv for prior instance of this specific component
 					vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*ComponentIcons)
 					if vgcomp == nil {
diff --git a/page-layout_vgen.go b/page-layout_vgen.go
index 76f8add..c94cc07 100644
--- a/page-layout_vgen.go
+++ b/page-layout_vgen.go
@@ -28,7 +28,7 @@ func (c *PageLayout) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x99F5B74F5CCCB667^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0x8B2D4746B52E59B^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*layout.Container)
 			if vgcomp == nil {
@@ -62,7 +62,7 @@ func (c *PageLayout) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 				vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
 				vgparent.AppendChild(vgn)
 				{
-					vgcompKey := vugu.MakeCompKey(0x347D3EA1C1D5C218^vgin.CurrentPositionHash(), vgiterkey)
+					vgcompKey := vugu.MakeCompKey(0x9D24A9F03E233C01^vgin.CurrentPositionHash(), vgiterkey)
 					// ask BuildEnv for prior instance of this specific component
 					vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*navigation.Pagination)
 					if vgcomp == nil {
@@ -81,7 +81,7 @@ func (c *PageLayout) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 				vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t"}
 				vgparent.AppendChild(vgn)
 				{
-					vgcompKey := vugu.MakeCompKey(0x2BD3C136CF37D5F^vgin.CurrentPositionHash(), vgiterkey)
+					vgcompKey := vugu.MakeCompKey(0x4CE18A367ABAD96^vgin.CurrentPositionHash(), vgiterkey)
 					// ask BuildEnv for prior instance of this specific component
 					vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*ComponentAddress)
 					if vgcomp == nil {
diff --git a/page-settings_vgen.go b/page-settings_vgen.go
index 85f0bdf..823fe5b 100644
--- a/page-settings_vgen.go
+++ b/page-settings_vgen.go
@@ -29,7 +29,7 @@ func (c *PageSettings) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x79BDE917909F852D^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0xC5746C53C53512AA^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*layout.Container)
 			if vgcomp == nil {
diff --git a/page-user_vgen.go b/page-user_vgen.go
index cfd7077..14e5df1 100644
--- a/page-user_vgen.go
+++ b/page-user_vgen.go
@@ -29,7 +29,7 @@ func (c *PageUser) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 		vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t"}
 		vgparent.AppendChild(vgn)
 		{
-			vgcompKey := vugu.MakeCompKey(0x277D2AE38F7CBDC5^vgin.CurrentPositionHash(), vgiterkey)
+			vgcompKey := vugu.MakeCompKey(0xED52DD8086EE9546^vgin.CurrentPositionHash(), vgiterkey)
 			// ask BuildEnv for prior instance of this specific component
 			vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*layout.Container)
 			if vgcomp == nil {
diff --git a/root.vugu b/root.vugu
index 67448ae..cf110f9 100644
--- a/root.vugu
+++ b/root.vugu
@@ -20,6 +20,10 @@
 						<vg-slot name="SymbolSlot"><icons:LInfoCircle></icons:LInfoCircle></vg-slot>
 						<vg-slot name="DefaultSlot"><div>Typography & Layout</div></vg-slot>
 					</navigation:SidebarEntry>
+					<navigation:SidebarEntry URL="/colors/">
+						<vg-slot name="SymbolSlot"><icons:LCustomize></icons:LCustomize></vg-slot>
+						<vg-slot name="DefaultSlot"><div>Colors</div></vg-slot>
+					</navigation:SidebarEntry>
 				</vg-slot>
 				<vg-slot name="BottomEntries">
 					<navigation:SidebarEntry URL="/user/">
diff --git a/root_vgen.go b/root_vgen.go
index a7a59d1..86e2c36 100644
--- a/root_vgen.go
+++ b/root_vgen.go
@@ -46,7 +46,7 @@ func (c *Root) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 				vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t"}
 				vgparent.AppendChild(vgn)
 				{
-					vgcompKey := vugu.MakeCompKey(0x3405DFBDDF796314^vgin.CurrentPositionHash(), vgiterkey)
+					vgcompKey := vugu.MakeCompKey(0x5FD3371A39D431E1^vgin.CurrentPositionHash(), vgiterkey)
 					// ask BuildEnv for prior instance of this specific component
 					vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*navigation.Sidebar)
 					if vgcomp == nil {
@@ -65,7 +65,7 @@ func (c *Root) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 						vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t\t\t"}
 						vgparent.AppendChild(vgn)
 						{
-							vgcompKey := vugu.MakeCompKey(0x7B15AD82E94AC9FE^vgin.CurrentPositionHash(), vgiterkey)
+							vgcompKey := vugu.MakeCompKey(0xE3A8164F5A04372F^vgin.CurrentPositionHash(), vgiterkey)
 							// ask BuildEnv for prior instance of this specific component
 							vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*navigation.ButtonFullscreen)
 							if vgcomp == nil {
@@ -92,7 +92,7 @@ func (c *Root) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 						vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t\t\t"}
 						vgparent.AppendChild(vgn)
 						{
-							vgcompKey := vugu.MakeCompKey(0x84A9842314000C65^vgin.CurrentPositionHash(), vgiterkey)
+							vgcompKey := vugu.MakeCompKey(0x40AD77E95D0B0F31^vgin.CurrentPositionHash(), vgiterkey)
 							// ask BuildEnv for prior instance of this specific component
 							vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*navigation.SidebarEntry)
 							if vgcomp == nil {
@@ -110,7 +110,7 @@ func (c *Root) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 								_ = vgparent
 
 								{
-									vgcompKey := vugu.MakeCompKey(0x4AE13405398E63E1^vgin.CurrentPositionHash(), vgiterkey)
+									vgcompKey := vugu.MakeCompKey(0xD933FB7812C407E5^vgin.CurrentPositionHash(), vgiterkey)
 									// ask BuildEnv for prior instance of this specific component
 									vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LHome)
 									if vgcomp == nil {
@@ -149,7 +149,7 @@ func (c *Root) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 						vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t\t\t"}
 						vgparent.AppendChild(vgn)
 						{
-							vgcompKey := vugu.MakeCompKey(0x7697B78DD59537F7^vgin.CurrentPositionHash(), vgiterkey)
+							vgcompKey := vugu.MakeCompKey(0x67BF8FEB9FE2AFC7^vgin.CurrentPositionHash(), vgiterkey)
 							// ask BuildEnv for prior instance of this specific component
 							vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*navigation.SidebarEntry)
 							if vgcomp == nil {
@@ -167,7 +167,7 @@ func (c *Root) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 								_ = vgparent
 
 								{
-									vgcompKey := vugu.MakeCompKey(0x904EB6B505091E68^vgin.CurrentPositionHash(), vgiterkey)
+									vgcompKey := vugu.MakeCompKey(0x44CFD6132E15904A^vgin.CurrentPositionHash(), vgiterkey)
 									// ask BuildEnv for prior instance of this specific component
 									vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LStar)
 									if vgcomp == nil {
@@ -206,7 +206,7 @@ func (c *Root) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 						vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t\t\t"}
 						vgparent.AppendChild(vgn)
 						{
-							vgcompKey := vugu.MakeCompKey(0x35E408C6CD0F9B84^vgin.CurrentPositionHash(), vgiterkey)
+							vgcompKey := vugu.MakeCompKey(0x687055596F676B79^vgin.CurrentPositionHash(), vgiterkey)
 							// ask BuildEnv for prior instance of this specific component
 							vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*navigation.SidebarEntry)
 							if vgcomp == nil {
@@ -224,7 +224,7 @@ func (c *Root) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 								_ = vgparent
 
 								{
-									vgcompKey := vugu.MakeCompKey(0x2C9B557A7ADC5B29^vgin.CurrentPositionHash(), vgiterkey)
+									vgcompKey := vugu.MakeCompKey(0x3E067124379085D0^vgin.CurrentPositionHash(), vgiterkey)
 									// ask BuildEnv for prior instance of this specific component
 									vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LInfoCircle)
 									if vgcomp == nil {
@@ -260,6 +260,63 @@ func (c *Root) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 							vgn = &vugu.VGNode{Component: vgcomp}
 							vgparent.AppendChild(vgn)
 						}
+						vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t\t\t"}
+						vgparent.AppendChild(vgn)
+						{
+							vgcompKey := vugu.MakeCompKey(0x26DB78B19CDE9FE7^vgin.CurrentPositionHash(), vgiterkey)
+							// ask BuildEnv for prior instance of this specific component
+							vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*navigation.SidebarEntry)
+							if vgcomp == nil {
+								// create new one if needed
+								vgcomp = new(navigation.SidebarEntry)
+								vgin.BuildEnv.WireComponent(vgcomp)
+							}
+							vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+							vgcomp.URL = "/colors/"
+							vgcomp.SymbolSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+								vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+								vgout = &vugu.BuildOut{}
+								vgout.Out = append(vgout.Out, vgn)
+								vgparent := vgn
+								_ = vgparent
+
+								{
+									vgcompKey := vugu.MakeCompKey(0xEFC80C8777C083D8^vgin.CurrentPositionHash(), vgiterkey)
+									// ask BuildEnv for prior instance of this specific component
+									vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LCustomize)
+									if vgcomp == nil {
+										// create new one if needed
+										vgcomp = new(icons.LCustomize)
+										vgin.BuildEnv.WireComponent(vgcomp)
+									}
+									vgin.BuildEnv.UseComponent(vgcompKey, vgcomp)	// ensure we can use this in the cache next time around
+									vgout.Components = append(vgout.Components, vgcomp)
+									vgn = &vugu.VGNode{Component: vgcomp}
+									vgparent.AppendChild(vgn)
+								}
+								return
+							})
+							vgcomp.DefaultSlot = vugu.NewBuilderFunc(func(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
+								vgn := &vugu.VGNode{Type: vugu.VGNodeType(3)}
+								vgout = &vugu.BuildOut{}
+								vgout.Out = append(vgout.Out, vgn)
+								vgparent := vgn
+								_ = vgparent
+
+								vgn = &vugu.VGNode{Type: vugu.VGNodeType(3), Namespace: "", Data: "div", Attr: []vugu.VGAttribute(nil)}
+								vgparent.AppendChild(vgn)
+								{
+									vgparent := vgn
+									_ = vgparent
+									vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "Colors"}
+									vgparent.AppendChild(vgn)
+								}
+								return
+							})
+							vgout.Components = append(vgout.Components, vgcomp)
+							vgn = &vugu.VGNode{Component: vgcomp}
+							vgparent.AppendChild(vgn)
+						}
 						vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t\t"}
 						vgparent.AppendChild(vgn)
 						return
@@ -274,7 +331,7 @@ func (c *Root) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 						vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t\t\t"}
 						vgparent.AppendChild(vgn)
 						{
-							vgcompKey := vugu.MakeCompKey(0x9C3929BD27B87723^vgin.CurrentPositionHash(), vgiterkey)
+							vgcompKey := vugu.MakeCompKey(0x4E86681CF525C89E^vgin.CurrentPositionHash(), vgiterkey)
 							// ask BuildEnv for prior instance of this specific component
 							vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*navigation.SidebarEntry)
 							if vgcomp == nil {
@@ -292,7 +349,7 @@ func (c *Root) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 								_ = vgparent
 
 								{
-									vgcompKey := vugu.MakeCompKey(0xA50422B595F02401^vgin.CurrentPositionHash(), vgiterkey)
+									vgcompKey := vugu.MakeCompKey(0x361D61CBB6A3794B^vgin.CurrentPositionHash(), vgiterkey)
 									// ask BuildEnv for prior instance of this specific component
 									vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LGlobe)
 									if vgcomp == nil {
@@ -331,7 +388,7 @@ func (c *Root) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 						vgn = &vugu.VGNode{Type: vugu.VGNodeType(1), Data: "\n\t\t\t\t\t"}
 						vgparent.AppendChild(vgn)
 						{
-							vgcompKey := vugu.MakeCompKey(0xD979BFAE35E6BD39^vgin.CurrentPositionHash(), vgiterkey)
+							vgcompKey := vugu.MakeCompKey(0xD9EECBBDE6D1BEE1^vgin.CurrentPositionHash(), vgiterkey)
 							// ask BuildEnv for prior instance of this specific component
 							vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*navigation.SidebarEntry)
 							if vgcomp == nil {
@@ -349,7 +406,7 @@ func (c *Root) Build(vgin *vugu.BuildIn) (vgout *vugu.BuildOut) {
 								_ = vgparent
 
 								{
-									vgcompKey := vugu.MakeCompKey(0xACAC312934F8C0E3^vgin.CurrentPositionHash(), vgiterkey)
+									vgcompKey := vugu.MakeCompKey(0x738695725E72705D^vgin.CurrentPositionHash(), vgiterkey)
 									// ask BuildEnv for prior instance of this specific component
 									vgcomp, _ := vgin.BuildEnv.CachedComponent(vgcompKey).(*icons.LSettings)
 									if vgcomp == nil {
diff --git a/router.go b/router.go
index 8432a81..5e86871 100644
--- a/router.go
+++ b/router.go
@@ -55,6 +55,10 @@ func vuguSetup(buildEnv *vugu.BuildEnv, eventEnv vugu.EventEnv) vugu.Builder {
 		root.Body = &PageLayout{}
 	}))
 
+	router.MustAddRouteExact("/colors/", vgrouter.RouteHandlerFunc(func(rm *vgrouter.RouteMatch) {
+		root.Body = &PageColors{}
+	}))
+
 	router.MustAddRouteExact("/user/", vgrouter.RouteHandlerFunc(func(rm *vgrouter.RouteMatch) {
 		root.Body = &PageUser{}
 	}))
diff --git a/scripts/dev-server/devserver.go b/scripts/dev-server/devserver.go
index 084c2a0..78e54d8 100644
--- a/scripts/dev-server/devserver.go
+++ b/scripts/dev-server/devserver.go
@@ -14,7 +14,7 @@ func main() {
 	// A hackish way to insert metadata and other stuff into the head tag.
 	simplehttp.DefaultStaticData["MetaTags"] = map[string]string{"viewport": "width=device-width, initial-scale=1"}
 	simplehttp.DefaultStaticData["Title"] = "D3vugu-components examples"
-	//simplehttp.DefaultStaticData["CSSFiles"] = []string{"/static/css/w3.css", "/static/font-awesome/css/all.min.css"}
+	simplehttp.DefaultStaticData["CSSFiles"] = []string{"/static/css/d3c-theme-base.css"}
 
 	wd, _ := os.Getwd()
 	uiDir := filepath.Join(wd)
diff --git a/static/css/d3c-theme-base.css b/static/css/d3c-theme-base.css
new file mode 100644
index 0000000..978a184
--- /dev/null
+++ b/static/css/d3c-theme-base.css
@@ -0,0 +1,144 @@
+:root, .d3c-color-layer-0 {
+	--d3c-color-background: white;
+	--d3c-color-text: black;
+
+	--d3c-color-border: #b7b7b7;
+
+	/*The following special colors must contrast well with --d3c-color-text*/
+	--d3c-color-hovered: #dadada;
+	--d3c-color-highlighted: #b7b7b7;
+	--d3c-color-selected: #b7b7b7;
+	--d3c-color-clicked: #b7b7b7;
+}
+
+.d3c-color-layer-1 {
+	--d3c-color-background: rgb(232, 232, 232);
+	--d3c-color-text: black;
+
+	--d3c-color-border: #b7b7b7;
+
+	--d3c-color-hovered: #dadada;
+	--d3c-color-highlighted: #b7b7b7;
+	--d3c-color-selected: #b7b7b7;
+	--d3c-color-clicked: #b7b7b7;
+}
+
+.d3c-color-layer-2 {
+	--d3c-color-background: rgb(207, 207, 207);
+	--d3c-color-text: black;
+
+	--d3c-color-border: #b7b7b7;
+
+	--d3c-color-hovered: #dadada;
+	--d3c-color-highlighted: #b7b7b7;
+	--d3c-color-selected: #b7b7b7;
+	--d3c-color-clicked: #b7b7b7;
+}
+
+.d3c-color-accent {
+	--d3c-color-background: #0063a1;
+	--d3c-color-text: white;
+
+	--d3c-color-border: #004976;
+
+	--d3c-color-hovered: #00558a;
+	--d3c-color-highlighted: #004976;
+	--d3c-color-selected: #004976;
+	--d3c-color-clicked: #004976;
+}
+
+.d3c-color-success {
+	--d3c-color-background: #178500;
+	--d3c-color-text: white;
+
+	--d3c-color-border: #116700;
+
+	--d3c-color-hovered: #147600;
+	--d3c-color-highlighted: #116700;
+	--d3c-color-selected: #116700;
+	--d3c-color-clicked: #116700;
+}
+
+.d3c-color-success-faded {
+	--d3c-color-background: #bef8b2;
+	--d3c-color-text: black;
+
+	--d3c-color-border: #116700;
+
+	--d3c-color-hovered: #147600;
+	--d3c-color-highlighted: #116700;
+	--d3c-color-selected: #116700;
+	--d3c-color-clicked: #116700;
+}
+
+.d3c-color-attention {
+	--d3c-color-background: #0063a1;
+	--d3c-color-text: white;
+
+	--d3c-color-border: #004671;
+
+	--d3c-color-hovered: #005285;
+	--d3c-color-highlighted: #004671;
+	--d3c-color-selected: #004671;
+	--d3c-color-clicked: #004671;
+}
+
+.d3c-color-attention-faded {
+	--d3c-color-background: #bbe5ff;
+	--d3c-color-text: black;
+
+	--d3c-color-border: #004671;
+
+	--d3c-color-hovered: #005285;
+	--d3c-color-highlighted: #004671;
+	--d3c-color-selected: #004671;
+	--d3c-color-clicked: #004671;
+}
+
+.d3c-color-caution {
+	--d3c-color-background: #ab9900;
+	--d3c-color-text: white;
+
+	--d3c-color-border: #7a6d00;
+
+	--d3c-color-hovered: #988900;
+	--d3c-color-highlighted: #7a6d00;
+	--d3c-color-selected: #7a6d00;
+	--d3c-color-clicked: #7a6d00;
+}
+
+.d3c-color-caution-faded {
+	--d3c-color-background: #fcf197;
+	--d3c-color-text: black;
+
+	--d3c-color-border: #7a6d00;
+
+	--d3c-color-hovered: #988900;
+	--d3c-color-highlighted: #7a6d00;
+	--d3c-color-selected: #7a6d00;
+	--d3c-color-clicked: #7a6d00;
+}
+
+.d3c-color-critical {
+	--d3c-color-background: #bc0000;
+	--d3c-color-text: white;
+
+	--d3c-color-border: #930000;
+
+	--d3c-color-hovered: #a70000;
+	--d3c-color-highlighted: #930000;
+	--d3c-color-selected: #930000;
+	--d3c-color-clicked: #930000;
+}
+
+.d3c-color-critical-faded {
+	--d3c-color-background: #fed3d3;
+	--d3c-color-text: black;
+
+	--d3c-color-border: #930000;
+
+	--d3c-color-hovered: #a70000;
+	--d3c-color-highlighted: #930000;
+	--d3c-color-selected: #930000;
+	--d3c-color-clicked: #930000;
+}