Index: tests/conf/tests/arr_merge.ref
===================================================================
--- tests/conf/tests/arr_merge.ref	(revision 23062)
+++ tests/conf/tests/arr_merge.ref	(revision 23063)
@@ -2,30 +2,30 @@
  I appearance/color/layer[] = <empty>
 === import 3 levels ===
 Result: 0
- I appearance/color/layer[0] = sys1 <<prio=200 from=embedded:4>> conf_rev=1
- I appearance/color/layer[1] = sys2 <<prio=200 from=embedded:5>> conf_rev=1
+ I appearance/color/layer[0] = #000001 <<prio=200 from=embedded:4>> conf_rev=1
+ I appearance/color/layer[1] = #000002 <<prio=200 from=embedded:4>> conf_rev=1
 Result: 0
- I appearance/color/layer[0] = user1 <<prio=400 from=embedded:4>> conf_rev=2
- I appearance/color/layer[1] = user2 <<prio=400 from=embedded:5>> conf_rev=2
+ I appearance/color/layer[0] = #000101 <<prio=400 from=embedded:4>> conf_rev=2
+ I appearance/color/layer[1] = #000102 <<prio=400 from=embedded:4>> conf_rev=2
 Result: 0
- I appearance/color/layer[0] = design1 <<prio=700 from=embedded:4>> conf_rev=3
- I appearance/color/layer[1] = design2 <<prio=700 from=embedded:5>> conf_rev=3
-=== change policy: design->prepend (design, user) ===
- I appearance/color/layer[0] = design1 <<prio=700 from=embedded:4>> conf_rev=4
- I appearance/color/layer[1] = design2 <<prio=700 from=embedded:5>> conf_rev=4
- I appearance/color/layer[2] = user1 <<prio=400 from=embedded:4>> conf_rev=4
- I appearance/color/layer[3] = user2 <<prio=400 from=embedded:5>> conf_rev=4
-=== change policy: user->append (design, sys, user) ===
- I appearance/color/layer[0] = design1 <<prio=700 from=embedded:4>> conf_rev=5
- I appearance/color/layer[1] = design2 <<prio=700 from=embedded:5>> conf_rev=5
- I appearance/color/layer[2] = sys1 <<prio=200 from=embedded:4>> conf_rev=5
- I appearance/color/layer[3] = sys2 <<prio=200 from=embedded:5>> conf_rev=5
- I appearance/color/layer[4] = user1 <<prio=400 from=embedded:4>> conf_rev=5
- I appearance/color/layer[5] = user2 <<prio=400 from=embedded:5>> conf_rev=5
-=== change policy: design->append (sys, user, design) ===
- I appearance/color/layer[0] = sys1 <<prio=200 from=embedded:4>> conf_rev=6
- I appearance/color/layer[1] = sys2 <<prio=200 from=embedded:5>> conf_rev=6
- I appearance/color/layer[2] = user1 <<prio=400 from=embedded:4>> conf_rev=6
- I appearance/color/layer[3] = user2 <<prio=400 from=embedded:5>> conf_rev=6
- I appearance/color/layer[4] = design1 <<prio=700 from=embedded:4>> conf_rev=6
- I appearance/color/layer[5] = design2 <<prio=700 from=embedded:5>> conf_rev=6
+ I appearance/color/layer[0] = #000201 <<prio=700 from=embedded:4>> conf_rev=3
+ I appearance/color/layer[1] = #000201 <<prio=700 from=embedded:4>> conf_rev=3
+=== change policy: design->prepend (2, 1) ===
+ I appearance/color/layer[0] = #000201 <<prio=700 from=embedded:4>> conf_rev=4
+ I appearance/color/layer[1] = #000201 <<prio=700 from=embedded:4>> conf_rev=4
+ I appearance/color/layer[2] = #000101 <<prio=400 from=embedded:4>> conf_rev=4
+ I appearance/color/layer[3] = #000102 <<prio=400 from=embedded:4>> conf_rev=4
+=== change policy: user->append (2, 0, 1) ===
+ I appearance/color/layer[0] = #000201 <<prio=700 from=embedded:4>> conf_rev=5
+ I appearance/color/layer[1] = #000201 <<prio=700 from=embedded:4>> conf_rev=5
+ I appearance/color/layer[2] = #000001 <<prio=200 from=embedded:4>> conf_rev=5
+ I appearance/color/layer[3] = #000002 <<prio=200 from=embedded:4>> conf_rev=5
+ I appearance/color/layer[4] = #000101 <<prio=400 from=embedded:4>> conf_rev=5
+ I appearance/color/layer[5] = #000102 <<prio=400 from=embedded:4>> conf_rev=5
+=== change policy: design->append (0, 1, 2) ===
+ I appearance/color/layer[0] = #000001 <<prio=200 from=embedded:4>> conf_rev=6
+ I appearance/color/layer[1] = #000002 <<prio=200 from=embedded:4>> conf_rev=6
+ I appearance/color/layer[2] = #000101 <<prio=400 from=embedded:4>> conf_rev=6
+ I appearance/color/layer[3] = #000102 <<prio=400 from=embedded:4>> conf_rev=6
+ I appearance/color/layer[4] = #000201 <<prio=700 from=embedded:4>> conf_rev=6
+ I appearance/color/layer[5] = #000201 <<prio=700 from=embedded:4>> conf_rev=6
Index: tests/conf/tests/arr_merge.test
===================================================================
--- tests/conf/tests/arr_merge.test	(revision 23062)
+++ tests/conf/tests/arr_merge.test	(revision 23063)
@@ -8,7 +8,7 @@
 		ha:overwrite { \
 			ha:appearance { \
 				ha:color { \
-					li:layer = { sys1; sys2 } \
+					li:layer = {{#000001}; {#000002};} \
 				} \
 			} \
 		} \
@@ -20,7 +20,7 @@
 		ha:overwrite { \
 			ha:appearance { \
 				ha:color { \
-					li:layer = { user1; user2 } \
+					li:layer = {{#000101}; {#000102};} \
 				} \
 			} \
 		} \
@@ -32,7 +32,7 @@
 		ha:overwrite { \
 			ha:appearance { \
 				ha:color { \
-					li:layer = { design1; design2 } \
+					li:layer = {{#000201}; {#000201};} \
 				} \
 			} \
 		} \
@@ -39,17 +39,17 @@
 	}
 dump native appearance/color/layer
 
-echo === change policy: design->prepend (design, user) ===
+echo === change policy: design->prepend (2, 1) ===
 role design
 chpolicy prepend
 dump native appearance/color/layer
 
-echo === change policy: user->append (design, sys, user) ===
+echo === change policy: user->append (2, 0, 1) ===
 role user
 chpolicy append
 dump native appearance/color/layer
 
-echo === change policy: design->append (sys, user, design) ===
+echo === change policy: design->append (0, 1, 2) ===
 role design
 chpolicy append
 dump native appearance/color/layer
Index: tests/conf/tests/arr_set.ref
===================================================================
--- tests/conf/tests/arr_set.ref	(revision 23062)
+++ tests/conf/tests/arr_set.ref	(revision 23063)
@@ -1,37 +1,37 @@
 === initial state: empty ===
  I appearance/color/layer[] = <empty>
 === append two items ===
- I appearance/color/layer[0] = foo <<prio=700 from=<cmd_reset *>:0>> conf_rev=1
- I appearance/color/layer[0] = foo <<prio=700 from=<cmd_reset *>:0>> conf_rev=2
- I appearance/color/layer[1] = bar <<prio=700 from=<cmd_reset *>:0>> conf_rev=2
+ I appearance/color/layer[0] = #000001 <<prio=700 from=<cmd_reset *>:0>> conf_rev=1
+ I appearance/color/layer[0] = #000001 <<prio=700 from=<cmd_reset *>:0>> conf_rev=2
+ I appearance/color/layer[1] = #000002 <<prio=700 from=<cmd_reset *>:0>> conf_rev=2
 === prepend two items ===
- I appearance/color/layer[0] = pre1 <<prio=700 from=<cmd_reset *>:0>> conf_rev=3
- I appearance/color/layer[1] = foo <<prio=700 from=<cmd_reset *>:0>> conf_rev=3
- I appearance/color/layer[2] = bar <<prio=700 from=<cmd_reset *>:0>> conf_rev=3
- I appearance/color/layer[0] = pre2 <<prio=700 from=<cmd_reset *>:0>> conf_rev=4
- I appearance/color/layer[1] = pre1 <<prio=700 from=<cmd_reset *>:0>> conf_rev=4
- I appearance/color/layer[2] = foo <<prio=700 from=<cmd_reset *>:0>> conf_rev=4
- I appearance/color/layer[3] = bar <<prio=700 from=<cmd_reset *>:0>> conf_rev=4
+ I appearance/color/layer[0] = #000003 <<prio=700 from=<cmd_reset *>:0>> conf_rev=3
+ I appearance/color/layer[1] = #000001 <<prio=700 from=<cmd_reset *>:0>> conf_rev=3
+ I appearance/color/layer[2] = #000002 <<prio=700 from=<cmd_reset *>:0>> conf_rev=3
+ I appearance/color/layer[0] = #000004 <<prio=700 from=<cmd_reset *>:0>> conf_rev=4
+ I appearance/color/layer[1] = #000003 <<prio=700 from=<cmd_reset *>:0>> conf_rev=4
+ I appearance/color/layer[2] = #000001 <<prio=700 from=<cmd_reset *>:0>> conf_rev=4
+ I appearance/color/layer[3] = #000002 <<prio=700 from=<cmd_reset *>:0>> conf_rev=4
 === overwrite item ===
- I appearance/color/layer[0] = pre2 <<prio=700 from=<cmd_reset *>:0>> conf_rev=6
- I appearance/color/layer[1] = NEW1 <<prio=700 from=<cmd_reset *>:0>> conf_rev=6
- I appearance/color/layer[2] = foo <<prio=700 from=<cmd_reset *>:0>> conf_rev=6
- I appearance/color/layer[3] = bar <<prio=700 from=<cmd_reset *>:0>> conf_rev=6
- I appearance/color/layer[0] = pre2 <<prio=700 from=<cmd_reset *>:0>> conf_rev=7
- I appearance/color/layer[1] = NEW1 <<prio=700 from=<cmd_reset *>:0>> conf_rev=7
- I appearance/color/layer[2] = foo <<prio=700 from=<cmd_reset *>:0>> conf_rev=7
- I appearance/color/layer[3] = bar <<prio=700 from=<cmd_reset *>:0>> conf_rev=7
- I appearance/color/layer[4] = NEW2 <<prio=700 from=<cmd_reset *>:0>> conf_rev=7
- I appearance/color/layer[0] = pre2 <<prio=700 from=<cmd_reset *>:0>> conf_rev=8
- I appearance/color/layer[1] = NEW1 <<prio=700 from=<cmd_reset *>:0>> conf_rev=8
- I appearance/color/layer[2] = foo <<prio=700 from=<cmd_reset *>:0>> conf_rev=8
- I appearance/color/layer[3] = bar <<prio=700 from=<cmd_reset *>:0>> conf_rev=8
- I appearance/color/layer[4] = NEW2 <<prio=700 from=<cmd_reset *>:0>> conf_rev=8
- I appearance/color/layer[5] = <NULL> <<prio=0>> conf_rev=8
- I appearance/color/layer[6] = <NULL> <<prio=0>> conf_rev=8
- I appearance/color/layer[7] = NEW3 <<prio=700 from=<cmd_reset *>:0>> conf_rev=8
+ I appearance/color/layer[0] = #000004 <<prio=700 from=<cmd_reset *>:0>> conf_rev=6
+ I appearance/color/layer[1] = #000005 <<prio=700 from=<cmd_reset *>:0>> conf_rev=6
+ I appearance/color/layer[2] = #000001 <<prio=700 from=<cmd_reset *>:0>> conf_rev=6
+ I appearance/color/layer[3] = #000002 <<prio=700 from=<cmd_reset *>:0>> conf_rev=6
+ I appearance/color/layer[0] = #000004 <<prio=700 from=<cmd_reset *>:0>> conf_rev=7
+ I appearance/color/layer[1] = #000005 <<prio=700 from=<cmd_reset *>:0>> conf_rev=7
+ I appearance/color/layer[2] = #000001 <<prio=700 from=<cmd_reset *>:0>> conf_rev=7
+ I appearance/color/layer[3] = #000002 <<prio=700 from=<cmd_reset *>:0>> conf_rev=7
+ I appearance/color/layer[4] = #000006 <<prio=700 from=<cmd_reset *>:0>> conf_rev=7
+ I appearance/color/layer[0] = #000004 <<prio=700 from=<cmd_reset *>:0>> conf_rev=8
+ I appearance/color/layer[1] = #000005 <<prio=700 from=<cmd_reset *>:0>> conf_rev=8
+ I appearance/color/layer[2] = #000001 <<prio=700 from=<cmd_reset *>:0>> conf_rev=8
+ I appearance/color/layer[3] = #000002 <<prio=700 from=<cmd_reset *>:0>> conf_rev=8
+ I appearance/color/layer[4] = #000006 <<prio=700 from=<cmd_reset *>:0>> conf_rev=8
+ I appearance/color/layer[5] =  <<prio=0>> conf_rev=8
+ I appearance/color/layer[6] =  <<prio=0>> conf_rev=8
+ I appearance/color/layer[7] = #000007 <<prio=700 from=<cmd_reset *>:0>> conf_rev=8
 === overwrite array ===
- I appearance/color/layer[0] = new <<prio=700 from=<cmd_reset *>:0>> conf_rev=10
- I appearance/color/layer[1] = pre1 <<prio=700 from=<cmd_reset *>:0>> conf_rev=10
- I appearance/color/layer[2] = foo <<prio=700 from=<cmd_reset *>:0>> conf_rev=10
- I appearance/color/layer[3] = bar <<prio=700 from=<cmd_reset *>:0>> conf_rev=10
+ I appearance/color/layer[0] = #000008 <<prio=700 from=<cmd_reset *>:0>> conf_rev=10
+ I appearance/color/layer[1] = #000003 <<prio=700 from=<cmd_reset *>:0>> conf_rev=10
+ I appearance/color/layer[2] = #000001 <<prio=700 from=<cmd_reset *>:0>> conf_rev=10
+ I appearance/color/layer[3] = #000002 <<prio=700 from=<cmd_reset *>:0>> conf_rev=10
Index: tests/conf/tests/arr_set.test
===================================================================
--- tests/conf/tests/arr_set.test	(revision 23062)
+++ tests/conf/tests/arr_set.test	(revision 23063)
@@ -7,19 +7,19 @@
 echo === append two items ===
 policy append
 
-set appearance/color/layer foo
+set appearance/color/layer #000001
 dump native appearance/color/layer
 
-set appearance/color/layer bar
+set appearance/color/layer #000002
 dump native appearance/color/layer
 
 echo === prepend two items ===
 policy prepend
 
-set appearance/color/layer pre1
+set appearance/color/layer #000003
 dump native appearance/color/layer
 
-set appearance/color/layer pre2
+set appearance/color/layer #000004
 dump native appearance/color/layer
 
 echo === overwrite item ===
@@ -26,13 +26,13 @@
 policy overwrite
 chprio 710
 
-set appearance/color/layer[1] NEW1
+set appearance/color/layer[1] #000005
 dump native appearance/color/layer
 
-set appearance/color/layer[4] NEW2
+set appearance/color/layer[4] #000006
 dump native appearance/color/layer
 
-set appearance/color/layer[7] NEW3
+set appearance/color/layer[7] #000007
 dump native appearance/color/layer
 
 
@@ -40,5 +40,5 @@
 policy overwrite
 chprio 720
 
-set appearance/color/layer new
+set appearance/color/layer #000008
 dump native appearance/color/layer