diff --git a/lib/phast/client/scripts/controls/CheckBox.js b/lib/phast/client/scripts/controls/CheckBox.js
index 898ad90..540d38e 100644
--- a/lib/phast/client/scripts/controls/CheckBox.js
+++ b/lib/phast/client/scripts/controls/CheckBox.js
@@ -11,11 +11,11 @@ function CheckBox(parentElement)
 		this.ParentElement.checked = this.mvarChecked;
 		if (this.mvarChecked)
 		{
-			this.NewParentElement.className = "CheckBox Checked";
+			this.NewParentElement.className = "uwt-checkbox uwt-checked";
 		}
 		else
 		{
-			this.NewParentElement.className = "CheckBox";
+			this.NewParentElement.className = "uwt-checkbox";
 		}
 		
 		if (!changed) return;
@@ -31,7 +31,7 @@ function CheckBox(parentElement)
 	}
 	
 	var child = document.createElement("div");
-	child.className = "CheckBox";
+	child.className = "uwt-checkbox";
 	child.NativeObject = this;
 	child.addEventListener("click", function(e)
 	{
@@ -41,7 +41,7 @@ function CheckBox(parentElement)
 	var fa = document.createElement("i");
 	fa.className = "fa fa-check";
 	child.appendChild(fa);
-	
+
 	parentElement.style.display = "none";
 	parentElement.parentNode.insertBefore(child, parentElement);
 	
diff --git a/lib/phast/client/scripts/controls/ListView.js b/lib/phast/client/scripts/controls/ListView.js
index 9605aa3..000d002 100644
--- a/lib/phast/client/scripts/controls/ListView.js
+++ b/lib/phast/client/scripts/controls/ListView.js
@@ -480,7 +480,7 @@ function ListView(parentElement)
 		// begin : magic - do not even begin to attempt to understand this logic
 		for (var i = 0; i < parentElement.tHead.rows[0].cells.length; i++)
 		{
-			if (parentElement.tHead.rows[0].cells[i].childNodes[0].className == "CheckBox")
+			if (parentElement.tHead.rows[0].cells[i].childNodes[0].className == "uwt-checkbox")
 			{
 				(function(i)
 				{