diff --git a/cstyle/main.go b/cstyle/main.go
index 0668716..de38720 100644
--- a/cstyle/main.go
+++ b/cstyle/main.go
@@ -55 +55 @@ var inheritedProps = []string{
-	// "text-align",
+	"text-align",
@@ -130 +129,0 @@ func CheckNode(n *element.Node, state *map[string]element.State) {
-	fmt.Printf("EM: %v\n", self.EM)
@@ -141,2 +140 @@ func CheckNode(n *element.Node, state *map[string]element.State) {
-func (c *CSS) ComputeNodeStyle(node *element.Node, state *map[string]element.State) *element.Node {
-
+func (c *CSS) ComputeNodeStyle(n *element.Node, state *map[string]element.State) *element.Node {
@@ -144,2 +142,2 @@ func (c *CSS) ComputeNodeStyle(node *element.Node, state *map[string]element.Sta
-	if utils.IsParent(*node, "head") {
-		return node
+	if utils.IsParent(*n, "head") {
+		return n
@@ -147,3 +144,0 @@ func (c *CSS) ComputeNodeStyle(node *element.Node, state *map[string]element.Sta
-
-	// !TODO: Make a plugin type system that can rewrite nodes and matches by more than just tagname
-	// + should be ran here once a node is loaded
@@ -150,0 +146,3 @@ func (c *CSS) ComputeNodeStyle(node *element.Node, state *map[string]element.Sta
+	// !ISSUE: This should add to state.Style instead as the element.Node should be un effected by the engine
+	// + currently this adds styles to the style attribute that the use did not explisitly set
+	// + this also applies to the margin/padding and border completer functions
@@ -153,18 +151,5 @@ func (c *CSS) ComputeNodeStyle(node *element.Node, state *map[string]element.Sta
-	self := s[node.Properties.Id]
-	parent := s[node.Parent.Properties.Id]
-
-	var n *element.Node
-
-	// !ISSUE: For some reason node is still being tainted
-	// + if the user changes the innerText of the swap parent then how does the swap get updated????
-	// + in theory it should be invalided when the main invalidator runs
-	if self.Swap.Properties.Id != "" {
-		n = &self.Swap
-		// fmt.Println("Swapped: ", n.Properties.Id, n.InnerText)
-		// CheckNode(node, state)
-		// CheckNode(&self.Swap, state)
-	} else {
-		n = node
-		// fmt.Println("Back: ", n.Properties.Id, n.InnerText)
-		self.Style = c.GetStyles(*n)
-	}
+	self := s[n.Properties.Id]
+	parent := s[n.Parent.Properties.Id]
+
+	// !ISSUE: BREAKING
+	self.Style = c.GetStyles(*n)
@@ -207,5 +191,0 @@ func (c *CSS) ComputeNodeStyle(node *element.Node, state *map[string]element.Sta
-	offsetX, offsetY := utils.GetXY(n, state)
-	x += offsetX
-	y += offsetY
-
-	// !NOTE: Maybe make a get xy offset function...
@@ -261 +241 @@ func (c *CSS) ComputeNodeStyle(node *element.Node, state *map[string]element.Sta
-								y = sibling.Y + sibling.Height + (sibling.Border.Width * 2) + sibling.Margin.Bottom
+								y = sibling.Y + sibling.Height
@@ -269 +249 @@ func (c *CSS) ComputeNodeStyle(node *element.Node, state *map[string]element.Sta
-					y += vState.Margin.Top + vState.Margin.Bottom + vState.Padding.Top + vState.Padding.Bottom + vState.Height + (self.Border.Width)
+					y += vState.Margin.Top + vState.Margin.Bottom + vState.Padding.Top + vState.Padding.Bottom + vState.Height + (vState.Border.Width * 2)
@@ -271,0 +252 @@ func (c *CSS) ComputeNodeStyle(node *element.Node, state *map[string]element.Sta
+
@@ -292 +273 @@ func (c *CSS) ComputeNodeStyle(node *element.Node, state *map[string]element.Sta
-	self.X = x
+	self.X = x + parent.Padding.Left
@@ -300,0 +282 @@ func (c *CSS) ComputeNodeStyle(node *element.Node, state *map[string]element.Sta
+		// !ISSUE: Doesn't break the h1 element for some reason
@@ -302,5 +283,0 @@ func (c *CSS) ComputeNodeStyle(node *element.Node, state *map[string]element.Sta
-			// !ISSUE: Still doesn't work great
-			if self.Swap.Properties.Id == "" {
-				self.Swap = *n
-				n = &self.Swap
-			}
@@ -307,0 +285 @@ func (c *CSS) ComputeNodeStyle(node *element.Node, state *map[string]element.Sta
+				// !ISSUE: this works great and it is how I want it to work but it does modifiy the dom which is a no go
@@ -312,7 +289,0 @@ func (c *CSS) ComputeNodeStyle(node *element.Node, state *map[string]element.Sta
-			} else {
-				el := n.CreateElement("notaspan")
-				el.InnerText = n.InnerText
-				n.AppendChild(el)
-				self.Style["font-size"] = parent.Style["font-size"]
-				self.EM = parent.EM
-				n.InnerText = ""
@@ -320 +290,0 @@ func (c *CSS) ComputeNodeStyle(node *element.Node, state *map[string]element.Sta
-			(*state)[n.Properties.Id] = self
@@ -338 +307,0 @@ func (c *CSS) ComputeNodeStyle(node *element.Node, state *map[string]element.Sta
-
@@ -343 +312 @@ func (c *CSS) ComputeNodeStyle(node *element.Node, state *map[string]element.Sta
-				self.Height = (cState.Y - self.Border.Width) - (self.Y) + cState.Height
+				self.Height = (cState.Y - self.Y) + cState.Height
@@ -355,2 +323,0 @@ func (c *CSS) ComputeNodeStyle(node *element.Node, state *map[string]element.Sta
-	self.Height += self.Padding.Bottom
-
@@ -358,0 +326,23 @@ func (c *CSS) ComputeNodeStyle(node *element.Node, state *map[string]element.Sta
+	// !ISSUE: Align Text
+	// if n.Style["text-align"] == "center" {
+	// 	minX := float32(9e15)
+	// 	maxXW := float32(0)
+	// 	fmt.Println(n.Properties.Id, len(n.Children))
+	// 	for _, v := range n.Children {
+	// 		cState := (*state)[v.Properties.Id]
+	// 		if cState.X < minX {
+	// 			minX = cState.X
+	// 		}
+	// 		if (cState.X + cState.Width) > maxXW {
+	// 			maxXW = cState.X + cState.Width
+	// 		}
+	// 	}
+	// 	for _, v := range n.Children {
+	// 		cState := (*state)[v.Properties.Id]
+	// 		cState.X += (self.Width - (maxXW - minX)) / 2
+	// 		(*state)[v.Properties.Id] = cState
+	// 	}
+	// }
+
+	// (*state)[n.Properties.Id] = self
+
@@ -372 +362 @@ func (c *CSS) ComputeNodeStyle(node *element.Node, state *map[string]element.Sta
-			// !NOTE: Might save memory by making a state map tree and passing that instead of the node it's self
+			// !ISSUE: Might save memory by making a state map tree and passing that instead of the node it's self
@@ -376,0 +367,6 @@ func (c *CSS) ComputeNodeStyle(node *element.Node, state *map[string]element.Sta
+	for i := range n.Children {
+		cState := (*state)[n.Children[i].Properties.Id]
+		cState.Y += self.Padding.Top
+		(*state)[n.Children[i].Properties.Id] = cState
+	}
+

package cstyle

import (
	"fmt"
	"gui/color"
	"gui/element"
	"gui/font"
	"gui/parser"
	"gui/utils"
	"os"
	"slices"
	"sort"
	"strconv"
	"strings"
)

type Plugin struct {
	Styles  map[string]string
	Level   int
	Handler func(*element.Node, *map[string]element.State)
}

type CSS struct {
	Width       float32
	Height      float32
	StyleSheets []map[string]map[string]string
	Plugins     []Plugin
	Document    *element.Node
}

func (c *CSS) StyleSheet(path string) {
	// Parse the CSS file
	dat, err := os.ReadFile(path)
	utils.Check(err)
	styles := parser.ParseCSS(string(dat))

	c.StyleSheets = append(c.StyleSheets, styles)
}

func (c *CSS) StyleTag(css string) {
	styles := parser.ParseCSS(css)
	c.StyleSheets = append(c.StyleSheets, styles)
}

var inheritedProps = []string{
	"color",
	"cursor",
	"font",
	"font-family",
	"font-size",
	"font-style",
	"font-weight",
	"letter-spacing",
	"line-height",
	// "text-align",
	"text-indent",
	"text-justify",
	"text-shadow",
	"text-transform",
	"text-decoration",
	"visibility",
	"word-spacing",
	"display",
}

func (c *CSS) GetStyles(n element.Node) map[string]string {
	styles := map[string]string{}

	if n.Parent != nil {
		ps := c.GetStyles(*n.Parent)
		for _, v := range inheritedProps {
			if ps[v] != "" {
				styles[v] = ps[v]
			}
		}
	}
	for k, v := range n.Style {
		styles[k] = v
	}
	hovered := false
	if slices.Contains(n.ClassList.Classes, ":hover") {
		hovered = true
	}

	for _, styleSheet := range c.StyleSheets {
		for selector := range styleSheet {
			// fmt.Println(selector, n.Properties.Id)
			key := selector
			if strings.Contains(selector, ":hover") && hovered {
				selector = strings.Replace(selector, ":hover", "", -1)
			}
			if element.TestSelector(selector, &n) {
				for k, v := range styleSheet[key] {
					styles[k] = v
				}
			}

		}
	}

	// This is different than node.Style
	// temp1 = ​CSS​​
	// temp1.style == CSSStyleDeclaration {0: 'color', accentColor: '', additiveSymbols: '', alignContent: '', alignItems: '', alignSelf: '', …}
	// temp1.getAttribute("style") == 'color:#a6e22e'
	inline := parser.ParseStyleAttribute(n.GetAttribute("style") + ";")
	styles = utils.Merge(styles, inline)
	// add hover and focus css events

	if n.Parent != nil {
		if styles["z-index"] == "" && n.Parent.Style["z-index"] != "" {
			z, _ := strconv.Atoi(n.Parent.Style["z-index"])
			z += 1
			styles["z-index"] = strconv.Itoa(z)
		}
	}

	return styles
}

func (c *CSS) AddPlugin(plugin Plugin) {
	c.Plugins = append(c.Plugins, plugin)
}

func CheckNode(n *element.Node, state *map[string]element.State) {
	s := *state
	self := s[n.Properties.Id]

	fmt.Println(n.TagName, n.Properties.Id)
	fmt.Printf("ID: %v\n", n.Id)
	fmt.Printf("EM: %v\n", self.EM)
	fmt.Printf("Parent: %v\n", n.Parent.TagName)
	fmt.Printf("Classes: %v\n", n.ClassList.Classes)
	fmt.Printf("Text: %v\n", n.InnerText)
	fmt.Printf("X: %v, Y: %v, Z: %v\n", self.X, self.Y, self.Z)
	fmt.Printf("Width: %v, Height: %v\n", self.Width, self.Height)
	fmt.Printf("Styles: %v\n", self.Style)
	fmt.Printf("Background: %v\n", self.Background)
	fmt.Printf("Border: %v\n\n\n", self.Border)
}

func (c *CSS) ComputeNodeStyle(node *element.Node, state *map[string]element.State) *element.Node {

	// Head is not renderable
	if utils.IsParent(*node, "head") {
		return node
	}

	// !TODO: Make a plugin type system that can rewrite nodes and matches by more than just tagname
	// + should be ran here once a node is loaded
	plugins := c.Plugins

	s := *state
	self := s[node.Properties.Id]
	parent := s[node.Parent.Properties.Id]

	var n *element.Node

	// !ISSUE: For some reason node is still being tainted
	// + if the user changes the innerText of the swap parent then how does the swap get updated????
	// + in theory it should be invalided when the main invalidator runs
	if self.Swap.Properties.Id != "" {
		n = &self.Swap
		// fmt.Println("Swapped: ", n.Properties.Id, n.InnerText)
		// CheckNode(node, state)
		// CheckNode(&self.Swap, state)
	} else {
		n = node
		// fmt.Println("Back: ", n.Properties.Id, n.InnerText)
		self.Style = c.GetStyles(*n)
	}

	self.Background = color.Parse(self.Style, "background")
	self.Border, _ = CompleteBorder(self.Style, self, parent)

	fs, _ := utils.ConvertToPixels(self.Style["font-size"], parent.EM, parent.Width)
	self.EM = fs

	if self.Style["display"] == "none" {
		self.X = 0
		self.Y = 0
		self.Width = 0
		self.Height = 0
		return n
	}

	if self.Style["width"] == "" && self.Style["display"] == "block" {
		self.Style["width"] = "100%"
	}

	// Set Z index value to be sorted in window
	if self.Style["z-index"] != "" {
		z, _ := strconv.Atoi(self.Style["z-index"])
		self.Z = float32(z)
	}

	if parent.Z > 0 {
		self.Z = parent.Z + 1
	}

	(*state)[n.Properties.Id] = self

	wh := utils.GetWH(*n, state)
	width := wh.Width
	height := wh.Height

	x, y := parent.X, parent.Y
	offsetX, offsetY := utils.GetXY(n, state)
	x += offsetX
	y += offsetY

	// !NOTE: Maybe make a get xy offset function...

	var top, left, right, bottom bool = false, false, false, false

	m := utils.GetMP(*n, wh, state, "margin")
	p := utils.GetMP(*n, wh, state, "padding")

	self.Margin = m
	self.Padding = p

	if self.Style["position"] == "absolute" {
		bas := utils.GetPositionOffsetNode(n, state)
		base := s[bas.Properties.Id]
		if self.Style["top"] != "" {
			v, _ := utils.ConvertToPixels(self.Style["top"], self.EM, parent.Width)
			y = v + base.Y
			top = true
		}
		if self.Style["left"] != "" {
			v, _ := utils.ConvertToPixels(self.Style["left"], self.EM, parent.Width)
			x = v + base.X
			left = true
		}
		if self.Style["right"] != "" {
			v, _ := utils.ConvertToPixels(self.Style["right"], self.EM, parent.Width)
			x = (base.Width - width) - v
			right = true
		}
		if self.Style["bottom"] != "" {
			v, _ := utils.ConvertToPixels(self.Style["bottom"], self.EM, parent.Width)
			y = (base.Height - height) - v
			bottom = true
		}

	} else {
		for i, v := range n.Parent.Children {
			vState := s[v.Properties.Id]
			if vState.Style["position"] != "absolute" {
				if v.Properties.Id == n.Properties.Id {
					if i-1 > 0 {
						sib := n.Parent.Children[i-1]
						sibling := s[sib.Properties.Id]
						if sibling.Style["position"] != "absolute" {
							if self.Style["display"] == "inline" {
								if sibling.Style["display"] == "inline" {
									y = sibling.Y
								} else {
									y = sibling.Y + sibling.Height
								}
							} else {
								y = sibling.Y + sibling.Height + (sibling.Border.Width * 2) + sibling.Margin.Bottom
							}
						}

					}
					break
				} else if self.Style["display"] != "inline" {
					vState := s[v.Properties.Id]
					y += vState.Margin.Top + vState.Margin.Bottom + vState.Padding.Top + vState.Padding.Bottom + vState.Height + (self.Border.Width)
				}
			}
		}
	}

	// Display modes need to be calculated here

	relPos := !top && !left && !right && !bottom

	if left || relPos {
		x += m.Left
	}
	if top || relPos {
		y += m.Top
	}
	if right {
		x -= m.Right
	}
	if bottom {
		y -= m.Bottom
	}

	self.X = x
	self.Y = y
	self.Width = width
	self.Height = height
	(*state)[n.Properties.Id] = self

	if !utils.ChildrenHaveText(n) && len(n.InnerText) > 0 {
		// Confirm text exists
		words := strings.Split(strings.TrimSpace(n.InnerText), " ")
		if len(words) != 1 {
			// !ISSUE: Still doesn't work great
			if self.Swap.Properties.Id == "" {
				self.Swap = *n
				n = &self.Swap
			}
			if self.Style["display"] == "inline" {
				n.InnerText = words[0]
				el := *n
				el.InnerText = strings.Join(words[1:], " ")
				n.Parent.InsertAfter(el, *n)
			} else {
				el := n.CreateElement("notaspan")
				el.InnerText = n.InnerText
				n.AppendChild(el)
				self.Style["font-size"] = parent.Style["font-size"]
				self.EM = parent.EM
				n.InnerText = ""
			}
			(*state)[n.Properties.Id] = self
		}
		if len(strings.TrimSpace(n.InnerText)) > 0 {
			n.InnerText = strings.TrimSpace(n.InnerText)
			self = genTextNode(n, state)
		}
	}

	(*state)[n.Properties.Id] = self
	(*state)[n.Parent.Properties.Id] = parent

	// Call children here

	var childYOffset float32
	for i := 0; i < len(n.Children); i++ {
		v := n.Children[i]
		v.Parent = n
		n.Children[i] = *c.ComputeNodeStyle(&v, state)

		cState := (*state)[n.Children[i].Properties.Id]
		if self.Style["height"] == "" {
			if cState.Style["position"] != "absolute" && cState.Y+cState.Height > childYOffset {
				childYOffset = cState.Y + cState.Height
				self.Height = (cState.Y - self.Border.Width) - (self.Y) + cState.Height
				self.Height += cState.Margin.Top
				self.Height += cState.Margin.Bottom
				self.Height += cState.Padding.Top
				self.Height += cState.Padding.Bottom
			}
		}
		if cState.Width > self.Width {
			self.Width = cState.Width
		}
	}

	self.Height += self.Padding.Bottom

	(*state)[n.Properties.Id] = self

	// Sorting the array by the Level field
	sort.Slice(plugins, func(i, j int) bool {
		return plugins[i].Level < plugins[j].Level
	})

	for _, v := range plugins {
		matches := true
		for name, value := range v.Styles {
			if self.Style[name] != value && !(value == "*") {
				matches = false
			}
		}
		if matches {
			// !NOTE: Might save memory by making a state map tree and passing that instead of the node it's self
			v.Handler(n, state)
		}
	}

	// CheckNode(n, state)

	return n
}

func CompleteBorder(cssProperties map[string]string, self, parent element.State) (element.Border, error) {
	// Split the shorthand into components
	borderComponents := strings.Fields(cssProperties["border"])

	// Ensure there are at least 1 component (width or style or color)
	if len(borderComponents) >= 1 {
		width := "0px" // Default width
		style := "solid"
		borderColor := "#000000" // Default color

		// Extract style and color if available
		if len(borderComponents) >= 1 {
			width = borderComponents[0]
		}

		// Extract style and color if available
		if len(borderComponents) >= 2 {
			style = borderComponents[1]
		}
		if len(borderComponents) >= 3 {
			borderColor = borderComponents[2]
		}

		parsedColor, _ := color.Color(borderColor)

		w, _ := utils.ConvertToPixels(width, self.EM, parent.Width)

		return element.Border{
			Width:  w,
			Style:  style,
			Color:  parsedColor,
			Radius: cssProperties["border-radius"],
		}, nil
	}

	return element.Border{}, fmt.Errorf("invalid border shorthand format")
}

func genTextNode(n *element.Node, state *map[string]element.State) element.State {
	s := *state
	self := s[n.Properties.Id]
	parent := s[n.Parent.Properties.Id]

	text := element.Text{}

	bold, italic := false, false

	if self.Style["font-weight"] == "bold" {
		bold = true
	}

	if self.Style["font-style"] == "italic" {
		italic = true
	}

	if text.Font == nil {
		f, _ := font.LoadFont(self.Style["font-family"], int(self.EM), bold, italic)
		text.Font = f
	}

	letterSpacing, _ := utils.ConvertToPixels(self.Style["letter-spacing"], self.EM, parent.Width)
	wordSpacing, _ := utils.ConvertToPixels(self.Style["word-spacing"], self.EM, parent.Width)
	lineHeight, _ := utils.ConvertToPixels(self.Style["line-height"], self.EM, parent.Width)
	if lineHeight == 0 {
		lineHeight = self.EM + 3
	}

	text.LineHeight = int(lineHeight)
	text.WordSpacing = int(wordSpacing)
	text.LetterSpacing = int(letterSpacing)
	wb := " "

	if self.Style["word-wrap"] == "break-word" {
		wb = ""
	}

	if self.Style["text-wrap"] == "wrap" || self.Style["text-wrap"] == "balance" {
		wb = ""
	}

	var dt float32

	if self.Style["text-decoration-thickness"] == "auto" || self.Style["text-decoration-thickness"] == "" {
		dt = self.EM / 7
	} else {
		dt, _ = utils.ConvertToPixels(self.Style["text-decoration-thickness"], self.EM, parent.Width)
	}

	col := color.Parse(self.Style, "font")

	self.Color = col

	text.Color = col
	text.DecorationColor = color.Parse(self.Style, "decoration")
	text.Align = self.Style["text-align"]
	text.WordBreak = wb
	text.WordSpacing = int(wordSpacing)
	text.LetterSpacing = int(letterSpacing)
	text.WhiteSpace = self.Style["white-space"]
	text.DecorationThickness = int(dt)
	text.Overlined = self.Style["text-decoration"] == "overline"
	text.Underlined = self.Style["text-decoration"] == "underline"
	text.LineThrough = self.Style["text-decoration"] == "linethrough"
	text.EM = int(self.EM)
	text.Width = int(parent.Width)
	text.Text = n.InnerText

	if self.Style["word-spacing"] == "" {
		text.WordSpacing = font.MeasureSpace(&text)
	}

	img, width := font.Render(&text)
	self.Texture = img

	if self.Style["height"] == "" {
		self.Height = float32(text.LineHeight)
	}

	if self.Style["width"] == "" {
		self.Width = float32(width)
	}

	return self
}