Index: /WAeUP_SRP/trunk/profiles/default/layouts/student_personal.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/layouts/student_personal.xml	(revision 423)
+++ /WAeUP_SRP/trunk/profiles/default/layouts/student_personal.xml	(revision 424)
@@ -52,5 +52,5 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
- <widget name="for_state" meta_type="String Widget">
+ <widget name="for_state" meta_type="Select Widget">
   <property name="title">Foreign Student State</property>
   <property name="fields">
@@ -62,15 +62,4 @@
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
- </widget>
- <widget name="for_state_old" meta_type="Select Widget">
-  <property name="title">Foreign Student State</property>
-  <property name="fields">
-   <element value="for_state"/>
-  </property>
-  <property name="label">Foreign Student State</property>
-  <property name="label_edit">Foreign Student State</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
   <property name="vocabulary">states</property>
  </widget>
Index: /WAeUP_SRP/trunk/profiles/default/vocabularies.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/vocabularies.xml	(revision 423)
+++ /WAeUP_SRP/trunk/profiles/default/vocabularies.xml	(revision 424)
@@ -15,3 +15,8 @@
  <object name="semester_voc" meta_type="CPS Vocabulary"/>
  <object name="local_gov_areas" meta_type="CPS Vocabulary"/>
+ <object name="states" meta_type="CPS Vocabulary"/>
+ <object name="high_grade" meta_type="CPS Vocabulary"/>
+ <object name="high_qual" meta_type="CPS Vocabulary"/>
+ <object name="religion" meta_type="CPS Vocabulary"/>
+ <object name="exam_types" meta_type="CPS Vocabulary"/>
  </object>
