diff --git a/draft/application/cms/cms-safe.ecf b/draft/application/cms/cms-safe.ecf
index 28c0c7c0..d225d9dd 100644
--- a/draft/application/cms/cms-safe.ecf
+++ b/draft/application/cms/cms-safe.ecf
@@ -14,6 +14,7 @@
 		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="encoder" location="..\..\..\library\text\encoder\encoder-safe.ecf" readonly="false"/>
+		<library name="css" location="..\..\library\text\css\css-safe.ecf" readonly="false"/>
 		<library name="http" location="..\..\..\library\network\protocol\http\http-safe.ecf" readonly="false"/>
 		<library name="openid" location="..\..\..\library\security\openid\consumer\openid-safe.ecf" readonly="false"/>
 		<library name="process" location="$ISE_LIBRARY\library\process\process-safe.ecf"/>
diff --git a/draft/application/cms/cms.ecf b/draft/application/cms/cms.ecf
index 486313e8..7d3f886d 100644
--- a/draft/application/cms/cms.ecf
+++ b/draft/application/cms/cms.ecf
@@ -15,6 +15,7 @@
 
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="encoder" location="..\..\..\library\text\encoder\encoder.ecf" readonly="false"/>
+		<library name="css" location="..\..\library\text\css\css.ecf" readonly="false"/>
 		<library name="http" location="..\..\..\library\network\protocol\http\http.ecf" readonly="false"/>
 		<library name="openid" location="..\..\..\library\security\openid\consumer\openid.ecf" />
 		<library name="process" location="$ISE_LIBRARY\library\process\process.ecf"/>
diff --git a/draft/library/text/css/css-safe.ecf b/draft/library/text/css/css-safe.ecf
new file mode 100644
index 00000000..32f848bf
--- /dev/null
+++ b/draft/library/text/css/css-safe.ecf
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="css" uuid="1A3423E5-9B5B-431D-A8C3-1CF638F74B6F" library_target="css">
+	<target name="css">
+		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/.git$</exclude>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/.svn$</exclude>
+		</file_rule>
+		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
+		</option>
+		<library name="base" location="$ISE_LIBRARY/library/base/base-safe.ecf"/>
+		<cluster name="src" location="." recursive="true"/>
+	</target>
+</system>
diff --git a/draft/library/text/css/css.ecf b/draft/library/text/css/css.ecf
new file mode 100644
index 00000000..6cfee3fc
--- /dev/null
+++ b/draft/library/text/css/css.ecf
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="css" uuid="1A3423E5-9B5B-431D-A8C3-1CF638F74B6F" library_target="css">
+	<target name="css">
+		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/.git$</exclude>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/.svn$</exclude>
+		</file_rule>
+		<option warning="true" full_class_checking="true" void_safety="none" syntax="standard">
+		</option>
+		<library name="base" location="$ISE_LIBRARY/library/base/base.ecf"/>
+		<cluster name="src" location="." recursive="true"/>
+	</target>
+</system>
diff --git a/draft/application/cms/src/kernel/cms_css_selector.e b/draft/library/text/css/src/css_selector.e
similarity index 62%
rename from draft/application/cms/src/kernel/cms_css_selector.e
rename to draft/library/text/css/src/css_selector.e
index 14bc1dcf..cc3f91c3 100644
--- a/draft/application/cms/src/kernel/cms_css_selector.e
+++ b/draft/library/text/css/src/css_selector.e
@@ -1,15 +1,18 @@
 note
-	description: "Summary description for {CMS_CSS_SELECTOR}."
+	description: "Summary description for {CSS_SELECTOR}."
 	author: ""
 	date: "$Date$"
 	revision: "$Revision$"
 
 class
-	CMS_CSS_SELECTOR
+	CSS_SELECTOR
 
 create
 	make_from_string
 
+convert
+	make_from_string ({READABLE_STRING_8, STRING_8, IMMUTABLE_STRING_8})
+
 feature {NONE} -- Initialization
 
 	make_from_string (s: READABLE_STRING_8)
diff --git a/draft/application/cms/src/kernel/cms_css_style.e b/draft/library/text/css/src/css_style.e
similarity index 97%
rename from draft/application/cms/src/kernel/cms_css_style.e
rename to draft/library/text/css/src/css_style.e
index d0bd4c05..d3c4f525 100644
--- a/draft/application/cms/src/kernel/cms_css_style.e
+++ b/draft/library/text/css/src/css_style.e
@@ -1,11 +1,11 @@
 note
-	description: "Summary description for {CMS_CSS_STYLE}."
+	description: "Summary description for {CSS_STYLE}."
 	date: "$Date$"
 	revision: "$Revision$"
 	EIS: "name=CSS reference", "protocol=URI", "src=http://www.w3schools.com/cssref/"
 
 class
-	CMS_CSS_STYLE
+	CSS_STYLE
 
 inherit
 	ITERABLE [READABLE_STRING_8]
@@ -16,7 +16,7 @@ create
 	make_with_items
 
 convert
-	make_with_string ({READABLE_STRING_8, STRING_8})
+	make_with_string ({READABLE_STRING_8, STRING_8, IMMUTABLE_STRING_8})
 
 feature {NONE} -- Initialization
 
@@ -58,7 +58,7 @@ feature -- Access
 
 feature -- Element change
 
-	plus alias "+" (a_other: CMS_CSS_STYLE): like Current
+	plus alias "+" (a_other: CSS_STYLE): like Current
 			-- <Precursor>
 		local
 			lst: ARRAYED_LIST [READABLE_STRING_8]
@@ -73,7 +73,7 @@ feature -- Element change
 			create Result.make_with_items (lst)
 		end
 
-	append (a_other: CMS_CSS_STYLE)
+	append (a_other: CSS_STYLE)
 			-- Append style from `a_other' into Current
 		do
 			across
diff --git a/draft/application/cms/src/kernel/cms_css.e b/draft/library/text/css/src/css_text.e
similarity index 69%
rename from draft/application/cms/src/kernel/cms_css.e
rename to draft/library/text/css/src/css_text.e
index d3cc9ff3..08555eb1 100644
--- a/draft/application/cms/src/kernel/cms_css.e
+++ b/draft/library/text/css/src/css_text.e
@@ -1,11 +1,11 @@
 note
-	description: "Summary description for {CMS_CSS}."
+	description: "Summary description for {CSS_TEXT}."
 	author: ""
 	date: "$Date$"
 	revision: "$Revision$"
 
 class
-	CMS_CSS
+	CSS_TEXT
 
 create
 	make
@@ -19,11 +19,21 @@ feature {NONE} -- Initialization
 
 feature -- Access
 
-	items: ARRAYED_LIST [TUPLE [selectors: ITERABLE [CMS_CSS_SELECTOR]; style: CMS_CSS_STYLE]]
+	items: ARRAYED_LIST [TUPLE [selectors: ITERABLE [CSS_SELECTOR]; style: CSS_STYLE]]
+
+	add_selector_style (a_selector: CSS_SELECTOR; a_style: CSS_STYLE)
+		do
+			items.force ([<<a_selector>>, a_style])
+		end
+
+	add_selectors_style (a_selectors: ITERABLE [CSS_SELECTOR]; a_style: CSS_STYLE)
+		do
+			items.force ([a_selectors, a_style])
+		end
 
 feature -- Conversion
 
-	string: READABLE_STRING_8
+	string: STRING_8
 		local
 			s: STRING_8
 		do