diff --git a/Diya/Diya2DNode.class.st b/Diya/Diya2DNode.class.st
index b9e888a..c843bef 100644
--- a/Diya/Diya2DNode.class.st
+++ b/Diya/Diya2DNode.class.st
@@ -2,7 +2,6 @@ Class {
 	#name : #Diya2DNode,
 	#superclass : #DiyaNode,
 	#instVars : [
-		'color',
 		'vbuffer'
 	],
 	#category : #'Diya-Graphics'
@@ -22,12 +21,12 @@ Diya2DNode >> boundingBox [
 
 { #category : #accessing }
 Diya2DNode >> color [
-	^ color
+	^ self style get: #color.
 ]
 
 { #category : #accessing }
 Diya2DNode >> color: anObject [
-	color := anObject
+	style set:#color value: anObject
 ]
 
 { #category : #accessing }
@@ -53,7 +52,6 @@ Diya2DNode >> initialize [
 	rotation := 0.
 	tf := Array2D identity: 3.
 	shader := Diya2DShader uniqueInstance.
-	color := Color white.
 	vbuffer := nil.
 ]
 
diff --git a/Diya/Diya2DNodeStyle.class.st b/Diya/Diya2DNodeStyle.class.st
deleted file mode 100644
index c60bf50..0000000
--- a/Diya/Diya2DNodeStyle.class.st
+++ /dev/null
@@ -1,95 +0,0 @@
-Class {
-	#name : #Diya2DNodeStyle,
-	#superclass : #DiyaNodeStyle,
-	#instVars : [
-		'bgcolor',
-		'color',
-		'border',
-		'fontSize',
-		'fontFamilly',
-		'borderColor',
-		'bgcolor2',
-		'fontStyle'
-	],
-	#category : #'Diya-Graphics'
-}
-
-{ #category : #accessing }
-Diya2DNodeStyle >> bgcolor [
-	^ bgcolor
-]
-
-{ #category : #accessing }
-Diya2DNodeStyle >> bgcolor2 [
-	^ bgcolor2
-]
-
-{ #category : #accessing }
-Diya2DNodeStyle >> bgcolor2: anObject [
-	bgcolor2 := anObject
-]
-
-{ #category : #accessing }
-Diya2DNodeStyle >> bgcolor: anObject [
-	bgcolor := anObject
-]
-
-{ #category : #accessing }
-Diya2DNodeStyle >> border [
-	^ border
-]
-
-{ #category : #accessing }
-Diya2DNodeStyle >> border: anObject [
-	border := anObject
-]
-
-{ #category : #accessing }
-Diya2DNodeStyle >> borderColor [
-	^ borderColor
-]
-
-{ #category : #accessing }
-Diya2DNodeStyle >> borderColor: anObject [
-	borderColor := anObject
-]
-
-{ #category : #accessing }
-Diya2DNodeStyle >> color [
-	^ color
-]
-
-{ #category : #accessing }
-Diya2DNodeStyle >> color: anObject [
-	color := anObject
-]
-
-{ #category : #accessing }
-Diya2DNodeStyle >> fontFamilly [
-	^ fontFamilly
-]
-
-{ #category : #accessing }
-Diya2DNodeStyle >> fontFamilly: anObject [
-	fontFamilly := anObject
-]
-
-{ #category : #accessing }
-Diya2DNodeStyle >> fontSize [
-	^ fontSize
-]
-
-{ #category : #accessing }
-Diya2DNodeStyle >> fontSize: anObject [
-	fontSize := anObject
-]
-
-{ #category : #accessing }
-Diya2DNodeStyle >> fontStyle [
-	^ fontStyle
-]
-
-{ #category : #accessing }
-Diya2DNodeStyle >> fontStyle: anObject [
-	fontStyle := anObject
-]
diff --git a/Diya/Diya2DPrimShape.class.st b/Diya/Diya2DPrimShape.class.st
index db475be..72bb837 100644
--- a/Diya/Diya2DPrimShape.class.st
+++ b/Diya/Diya2DPrimShape.class.st
@@ -4,21 +4,29 @@ Class {
 	#instVars : [
 		'texture',
 		'type',
-		'border',
-		'bcolor',
 		'bbox'
 	],
 	#category : #'Diya-Graphics'
 }
 
+{ #category : #accessing }
+Diya2DPrimShape >> border [
+	^style get: #border
+]
+
+{ #category : #accessing }
+Diya2DPrimShape >> borderColor [
+	^style get: #borderColor
+]
+
 { #category : #accessing }
 Diya2DPrimShape >> borderColor: c [
-	bcolor := c
+	style set: #borderColor value: c.
 ]
 
 { #category : #accessing }
 Diya2DPrimShape >> borderWidth: w [
-	border := w
+	style set: #border value: w.
 ]
 
 { #category : #accessing }
@@ -41,19 +49,17 @@ Diya2DPrimShape >> draw [
 	OpenGL drawArrays: type first:0  count:((vbuffer size )>> 2 ).
 	"reset value"
 	self texture ifNotNil: [self texture drop.].
-	border > 0 ifTrue: [ self drawBorder ].
+	self border > 0 ifTrue: [ self drawBorder ].
 	context vao disableAttribute: 0.
 ]
 
 { #category : #initialization }
 Diya2DPrimShape >> drawBorder [
 	"Diya2DShader uniqueInstance use."
-	color = bcolor ifFalse:[
-		shader setUniform: #u_color value: bcolor asGL4FArray;
-		setUniform: #u_texture_type value: 0.
-	].
+	shader setUniform: #u_color value: self borderColor  asGL4FArray;
+	setUniform: #u_texture_type value: 0.
 	OpenGL
-		lineWidth: border.
+		lineWidth: self border.
 	self drawLines.
 	OpenGL lineWidth: 1.0.
 ]
@@ -79,8 +85,6 @@ Diya2DPrimShape >> initialize [
 	texture := nil.
 	children := nil.
 	type := GL_TRIANGLES.
-	border := 0.
-	bcolor := Color white.
 	bbox := Rectangle origin: 0@0 corner: 0@0.
 ]
 
diff --git a/Diya/DiyaApplicationLauncher.class.st b/Diya/DiyaApplicationLauncher.class.st
index c9f2095..ffd8753 100644
--- a/Diya/DiyaApplicationLauncher.class.st
+++ b/Diya/DiyaApplicationLauncher.class.st
@@ -80,7 +80,7 @@ DiyaApplicationLauncher >> running [
 DiyaApplicationLauncher >> setup [
 	event := SDL_Event new.
 	root addNode: (Diya2DNode new) at: 0@10.
-	txtFPS := root addNode:(DiyaText data: 'tick') at: ( self context resolution x - 80)@40.
+	txtFPS := root addNode:(DiyaText data: '') at: ( self context resolution x - 80)@40.
 	txtFPS extent: 80@40.
 	txtFPS fontSize: 18.
 	txtFPS color: Color red.
diff --git a/Diya/DiyaDefaultStyle.class.st b/Diya/DiyaDefaultStyle.class.st
index d46a7e2..f995a31 100644
--- a/Diya/DiyaDefaultStyle.class.st
+++ b/Diya/DiyaDefaultStyle.class.st
@@ -1,18 +1,18 @@
 Class {
 	#name : #DiyaDefaultStyle,
-	#superclass : #Diya2DNodeStyle,
+	#superclass : #DiyaNodeStyle,
 	#category : #'Diya-Graphics'
 }
 
 { #category : #initialization }
 DiyaDefaultStyle >> initialize [ 
 	super initialize.
-	bgcolor := (Color r: 0.2118 g: 0.2118  b: 0.2118).
-	color := Color white.
-	border := 1.
-	fontSize := 18.
-	fontFamilly := DiyaFontManager uniqueInstance defaultFamily.
-	fontStyle := DiyaFontManager uniqueInstance defaultStyle.
-	borderColor := (Color r: 0.051 g: 0.051  b: 0.051).
-	bgcolor2 := (Color r: 0.1529 g: 0.1529  b: 0.1529)
+	self set: #bgcolor value:(Color r: 0.2118 g: 0.2118  b: 0.2118).
+	self set: #color value: Color white.
+	self set: #border value: 1.
+	self set: #fontSize value: 18.
+	self set: #fontFamily value: DiyaFontManager uniqueInstance defaultFamily.
+	self set: #fontStyle value: DiyaFontManager uniqueInstance defaultStyle.
+	self set: #borderColor value: (Color r: 0.051 g: 0.051  b: 0.051).
+	self set: #bgcolor2 value: (Color r: 0.1529 g: 0.1529  b: 0.1529)
 ]
diff --git a/Diya/DiyaEllipse.class.st b/Diya/DiyaEllipse.class.st
index 0deeea8..7a47647 100644
--- a/Diya/DiyaEllipse.class.st
+++ b/Diya/DiyaEllipse.class.st
@@ -85,8 +85,8 @@ DiyaEllipse >> ry: anObject [
 DiyaEllipse >> setUpShader [
 	super setUpShader.
 	self shader
-		setUniform: #u_border value: border;
-		setUniform: #u_border_color value: bcolor asGL4FArray;
+		setUniform: #u_border value: (style get: #border);
+		setUniform: #u_border_color value: (style get:#borderColor) asGL4FArray;
 		setUniform: #u_rx value: rx;
 		setUniform: #u_ry value: ry.
 ]
diff --git a/Diya/DiyaExampleApp.class.st b/Diya/DiyaExampleApp.class.st
index 00fd552..7f3cae5 100644
--- a/Diya/DiyaExampleApp.class.st
+++ b/Diya/DiyaExampleApp.class.st
@@ -16,21 +16,22 @@ DiyaExampleApp >> main [
 
 { #category : #accessing }
 DiyaExampleApp >> setup [
-	|node node1 ell txtNode icon|
-	txtNode := root addNode: (DiyaText data: 'Event') at: 10@55.
-	txtNode color: Color orange.
-	txtNode extent: 200@40.
+	|node node1 ell label icon|
+	label := root addNode: (DiyaLabel new) at: 10@30.
+	label extent: 250@30.
+	label color: Color orange.
+	label icon: 16rF254.
 	
 	node1 := root addNode: (DiyaRectangle size:100@150 shader: DiyaExampleShader uniqueInstance) at: 100 @ 400.
 	node1 rotation: (Float pi / 8.0).
 	node1 scale: 1.2@1.2.
 	node1 on: #(mousebuttondown fingerdown) do:[:e|
-		txtNode data: 'Mouse ', (node1 local: e mapped worldPosition) asIntegerPoint asString].
+		label txt: 'Mouse ', (node1 local: e mapped worldPosition) asIntegerPoint asString].
 	
 	node := root addNode: (DiyaImageView from:'mrsang.png') at: 250 @ 430.
 	node color: (Color r: 1.0 g:1.0  b:1.0  alpha:1.0 ).
-	node borderColor: Color red.
-	node borderWidth: 3.0.
+	"node borderColor: Color red."
+	"node borderWidth: 3.0."
 	node extent:200@200.
 	
 	node := root addNode: (DiyaText data: String loremIpsum) at: 10@400.
@@ -49,7 +50,7 @@ DiyaExampleApp >> setup [
 	"node rotation: Float pi / 2.0."
 	ell textureNamed:'mrsang.png'.
 	ell on: #(mousebuttondown fingerdown) do:[:e|
-		txtNode data: 'Ellipse clicked', (ell local:e mapped worldPosition) asIntegerPoint asString].
+		label txt: 'Ellipse clicked', (ell local:e mapped worldPosition) asIntegerPoint asString].
 
 	node := root addNode: (DiyaConvexPolygon points:{250@100. 400@250. 450@80. 350@60}).
 	node color: Color green.
diff --git a/Diya/DiyaFontIcon.class.st b/Diya/DiyaFontIcon.class.st
index 8ddb53d..d9e62ab 100644
--- a/Diya/DiyaFontIcon.class.st
+++ b/Diya/DiyaFontIcon.class.st
@@ -34,7 +34,7 @@ DiyaFontIcon >> drawText [
 DiyaFontIcon >> fontName: name style: face size: size [
 	super fontName: name style:face  size: size. 
 	data ifNil: [ ^ self ].
-	bbox := Rectangle origin: 0@0 corner: ((data size) * (self fontSize) ) @ self fontSize.
+	bbox := Rectangle origin: 0@0 corner: ((data size) * size ) @ size.
 ]
 
 { #category : #initialization }
@@ -49,7 +49,6 @@ DiyaFontIcon >> initialize [
 	self fontName: 'bootstrap-icons' style: 'Regular' size: 16.
 	vbuffer :=  FFIExternalArray externalNewType: GLfloat size:24.
 	vbuffer autoRelease.
-	style := DiyaFontManager uniqueInstance defaultIconSet. 
 ]
 
 { #category : #initialization }
diff --git a/Diya/DiyaLabel.class.st b/Diya/DiyaLabel.class.st
index 871f7db..ad3793b 100644
--- a/Diya/DiyaLabel.class.st
+++ b/Diya/DiyaLabel.class.st
@@ -8,19 +8,6 @@ Class {
 	#category : #'Diya-Widgets'
 }
 
-{ #category : #accessing }
-DiyaLabel >> applyStyle [
-	txt color: style color.
-	txt fontName: style fontFamily style: style fontStyle  size: style fontSize.
-	txt wordWrap: true.
-	icon ifNotNil: [
-		icon color: style color.
-		icon fontSize: style fontSize
-	].
-	"update extent"
-	
-]
-
 { #category : #accessing }
 DiyaLabel >> icon [
 	^ icon
@@ -29,8 +16,8 @@ DiyaLabel >> icon [
 { #category : #accessing }
 DiyaLabel >> icon: anObject [
 	icon := nil.
-	anObject isNumber ifTrue: [ icon := root addNode: (DiyaFontIcon data: anObject) ].
-	anObject isString ifTrue: [ icon := root addNode: (DiyaImageView from: anObject)].
+	anObject isNumber ifTrue: [ icon := self addNode: (DiyaFontIcon data: anObject) ].
+	anObject isString ifTrue: [ icon := self addNode: (DiyaImageView from: anObject)].
 	icon ifNil: [ ^ DiyaCoreAPIError signal: 'Invalid icon identification'].
 	dirty := true.
 ]
@@ -38,9 +25,10 @@ DiyaLabel >> icon: anObject [
 { #category : #initialization }
 DiyaLabel >> initialize [
 	super initialize.
-	txt := root addNode:(DiyaText new).
+	txt := self addNode:(DiyaText data: '').
 	icon := nil.
 	self extent: 0@0.
+	"style := DiyaDefaultStyle uniqueInstance."
 ]
 
 { #category : #accessing }
@@ -53,3 +41,17 @@ DiyaLabel >> txt: anObject [
 	txt data: anObject.
 	dirty := true
 ]
+
+{ #category : #accessing }
+DiyaLabel >> updateLayout [
+	|offset isize|
+	offset := 0.
+	isize := style get: #fontSize.
+	icon ifNotNil: [
+		offset :=  isize + (isize >> 1).
+		icon position: 0 @ (extent y - isize)
+	].
+	txt extent: (extent x - offset) @ (extent y).
+	txt position: offset @ (extent y)
+	
+]
diff --git a/Diya/DiyaLine.class.st b/Diya/DiyaLine.class.st
index 71dc0f7..6fa1652 100644
--- a/Diya/DiyaLine.class.st
+++ b/Diya/DiyaLine.class.st
@@ -32,17 +32,12 @@ DiyaLine class >> points: points [
 			yourself
 ]
 
-{ #category : #accessing }
-DiyaLine >> borderColor: c [
-	color := c
-]
-
 { #category : #initialization }
 DiyaLine >> draw [
 	OpenGL
 		"enable: GL_LINE_SMOOTH;
 		hint: GL_LINE_SMOOTH_HINT mode: GL_NICEST;"
-		lineWidth: border.
+		lineWidth: self border.
 	super draw.
 	OpenGL lineWidth: 1.0";
 		disable: GL_LINE_SMOOTH".
@@ -78,7 +73,7 @@ DiyaLine >> initialize [
 	vbuffer :=  FFIExternalArray externalNewType: GLfloat size:8.
 	vbuffer autoRelease.
 	type := GL_LINES.
-	border := 1.0
+	style set: #border value: 0
 ]
 
 { #category : #'as yet unclassified' }
diff --git a/Diya/DiyaNode.class.st b/Diya/DiyaNode.class.st
index 8cb1a9a..15d945f 100644
--- a/Diya/DiyaNode.class.st
+++ b/Diya/DiyaNode.class.st
@@ -12,7 +12,8 @@ Class {
 		'context',
 		'dirty',
 		'ehandlers',
-		'root'
+		'root',
+		'style'
 	],
 	#pools : [
 		'OpenGLConstants',
@@ -39,6 +40,7 @@ DiyaNode >> addNode: node at: pos [
 	node position: pos.
 	children add: node.
 	node root: self root.
+	node style parent: style.
 	^ node
 ]
 
@@ -76,6 +78,7 @@ DiyaNode >> initialize [
 	children := OrderedCollection new.
 	dirty := false.
 	ehandlers := Dictionary new.
+	style := DiyaNodeStyle new.
 	root := nil.
 ]
 
@@ -128,7 +131,8 @@ DiyaNode >> register: aBlock to: eventName [
 
 { #category : #accessing }
 DiyaNode >> render [
-	dirty ifTrue:[dirty := self update not].
+	dirty ifTrue:[
+		dirty := self update not].
 	shader ifNotNil: [ self setUpShader  ].
 	self draw.
 	children ifNil: [ ^self ].
@@ -199,9 +203,20 @@ DiyaNode >> shader: anObject [
 	shader := anObject
 ]
 
+{ #category : #accessing }
+DiyaNode >> style [
+	^style
+]
+
+{ #category : #accessing }
+DiyaNode >> style: aStyle [
+	style := aStyle.
+	dirty := true.
+	parent ifNotNil: [ style parent: parent style ]
+]
+
 { #category : #accessing }
 DiyaNode >> tf [
-	parent ifNil: [ ^ DiyaCoreAPIError signal: 'TF: This node is not attached to the main tree' ].
 	^ tf
 ]
 
diff --git a/Diya/DiyaNodeStyle.class.st b/Diya/DiyaNodeStyle.class.st
index 1ef32d5..a7ee67b 100644
--- a/Diya/DiyaNodeStyle.class.st
+++ b/Diya/DiyaNodeStyle.class.st
@@ -1,5 +1,41 @@
 Class {
 	#name : #DiyaNodeStyle,
 	#superclass : #DiyaBaseObject,
+	#instVars : [
+		'styles',
+		'parent'
+	],
 	#category : #'Diya-Graphics'
 }
+
+{ #category : #'as yet unclassified' }
+DiyaNodeStyle class >> inherit: parent [
+	^self new parent: parent; yourself
+]
+
+{ #category : #initialization }
+DiyaNodeStyle >> get: styleName [
+	^ styles at: styleName ifAbsent: [ parent ifNotNil: [ parent get: styleName ] ifNil: nil]
+]
+
+{ #category : #initialization }
+DiyaNodeStyle >> initialize [ 
+	super initialize.
+	styles := Dictionary new.
+	parent := nil
+]
+
+{ #category : #accessing }
+DiyaNodeStyle >> parent [
+	^ parent
+]
+
+{ #category : #accessing }
+DiyaNodeStyle >> parent: anObject [
+	parent := anObject
+]
+
+{ #category : #initialization }
+DiyaNodeStyle >> set: styleName value: value [
+	styles at: styleName put: value
+]
diff --git a/Diya/DiyaRootNode.class.st b/Diya/DiyaRootNode.class.st
index 963ce4a..b4d91b5 100644
--- a/Diya/DiyaRootNode.class.st
+++ b/Diya/DiyaRootNode.class.st
@@ -11,7 +11,9 @@ DiyaRootNode >> boundingBox [
 
 { #category : #accessing }
 DiyaRootNode >> draw [
-	OpenGL clearColorR: 0.0 G: 0.0 B: 0.0  A:0.
+	|c|
+	c := style get: #bgcolor.
+	OpenGL clearColorR: c red G: c green B: c blue  A: c alpha.
 	OpenGL clear: GL_COLOR_BUFFER_BIT.
 	context vbo bind: GL_ARRAY_BUFFER.
 ]
@@ -27,6 +29,7 @@ DiyaRootNode >> initialize [
 	parent := self.
 	shader := nil.
 	root := self.
+	style := DiyaDefaultStyle new
 ]
 
 { #category : #'as yet unclassified' }
diff --git a/Diya/DiyaText.class.st b/Diya/DiyaText.class.st
index 9e7fb3f..ce84674 100644
--- a/Diya/DiyaText.class.st
+++ b/Diya/DiyaText.class.st
@@ -2,13 +2,10 @@ Class {
 	#name : #DiyaText,
 	#superclass : #Diya2DPrimShape,
 	#instVars : [
-		'fontStyle',
-		'fontSize',
-		'fontName',
 		'data',
-		'style',
 		'wrap',
-		'texheight'
+		'texheight',
+		'font'
 	],
 	#pools : [
 		'FT2Types'
@@ -76,25 +73,21 @@ DiyaText >> extent: v [
 
 { #category : #accessing }
 DiyaText >> fontName [
-	^ fontName
+	^ self style get: #fontFamily
 ]
 
 { #category : #initialization }
 DiyaText >> fontName: name style: face size: size [
-	name  ifNotNil: [fontName := name].
-	face ifNotNil: [fontStyle := face].
-	
-	fontName := fontName  ifNil: [DiyaFontManager uniqueInstance defaultFamily].
-	fontStyle := fontStyle ifNil: [DiyaFontManager uniqueInstance defaultStyle].
-	
-	fontSize := size.
-	style := DiyaFontManager uniqueInstance style: self fontStyle  from: self fontName.
+	name  ifNotNil: [style set:#fontFamily value: name].
+	face ifNotNil: [style set: #fontStyle value:face].
+	style set: #fontSize value: size.
+	font := nil.
 	dirty := true.
 ]
 
 { #category : #accessing }
 DiyaText >> fontSize [
-	^ fontSize
+	^ self style get:#fontSize
 ]
 
 { #category : #initialization }
@@ -104,7 +97,7 @@ DiyaText >> fontSize: size [
 
 { #category : #accessing }
 DiyaText >> fontStyle [
-	^ fontStyle
+	^ self style get: #fontStyle
 ]
 
 { #category : #accessing }
@@ -147,12 +140,10 @@ DiyaText >> getLinebreakIndices: delta [
 { #category : #initialization }
 DiyaText >> initialize [
 	super initialize.
-	"self fontName: 'Ubuntu' style:'Regular'  size: 16."
 	data := nil.
 	wrap := false.
-	bbox := nil.
 	texheight := 0.
-	self fontSize: 16
+	style set: #border value: 0
 ]
 
 { #category : #'as yet unclassified' }
@@ -165,9 +156,10 @@ DiyaText >> lastSeparatorFrom: index [
 
 { #category : #accessing }
 DiyaText >> texture [
-	|tex|
-	tex := style textureOf: self fontSize.
-	texheight = tex height ifFalse: [ 
+	| tex|
+	font:= font ifNil: [ DiyaFontManager uniqueInstance style: self fontStyle  from: self fontName ].
+	tex := font textureOf: self fontSize.
+	texheight = tex height ifFalse: [
 		texheight := tex height.
 		self update.
 		dirty := false.	
diff --git a/Diya/DiyaWidget.class.st b/Diya/DiyaWidget.class.st
index a456113..49a9832 100644
--- a/Diya/DiyaWidget.class.st
+++ b/Diya/DiyaWidget.class.st
@@ -2,7 +2,6 @@ Class {
 	#name : #DiyaWidget,
 	#superclass : #Diya2DNode,
 	#instVars : [
-		'style',
 		'extent'
 	],
 	#category : #'Diya-Widgets'
@@ -13,11 +12,6 @@ DiyaWidget class >> fromStyle: aStyle [
 	^self new style: aStyle; yourself 
 ]
 
-{ #category : #accessing }
-DiyaWidget >> applyStyle [
-	self subclassResponsibility
-]
-
 { #category : #geometry }
 DiyaWidget >> extent: size [
 	extent := size.
@@ -38,11 +32,16 @@ DiyaWidget >> style [
 { #category : #accessing }
 DiyaWidget >> style: anObject [
 	style := anObject.
-	self applyStyle.
+	dirty := true
 ]
 
 { #category : #accessing }
 DiyaWidget >> update [
-	self applyStyle.
+	self updateLayout.
 	^ true
 ]
+
+{ #category : #accessing }
+DiyaWidget >> updateLayout [
+	self subclassResponsibility 
+]