=== modified file 'scripts/casper-bottom/30accessibility'
--- scripts/casper-bottom/30accessibility	2006-10-16 15:18:41 +0000
+++ scripts/casper-bottom/30accessibility	2006-10-23 12:55:35 +0000
@@ -52,14 +52,17 @@
                         gct -s -t string /desktop/gnome/peripherals/mouse/cursor_theme whiteglass
 
                         kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/
+                        if [ -d /root/usr/share/xubuntu-default-settings/accessibility ]; then
+                            cp -a /root/usr/share/xubuntu-default-settings/accessibility/* /root/etc/xdg/
+                        fi
                         ;;
                         # Moderate Visual Impairment
                         access=v2)
                         gct -s -t bool /desktop/gnome/interface/accessibility true
                         gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [orca]
-                        #gct -s -t bool /apps/gnopernicus/srcore/mag_active true
-                        #gct -s -t bool /apps/gnopernicus/srcore/sp_active false
-
+                        if [ -e /root/usr/share/python-support/gnome-orca/orca/settings.py ]; then
+                            sed -i '/^enableSpeech\W/ s/True/False/;/^enableMagnifier/ s/False/True/' /root/usr/share/python-support/gnome-orca/orca/settings.py
+                        fi
                         kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/,/usr/share/kubuntu-default-settings/kde-profile/moderate-visual-impairment/
                         ;;
                         # Blindness
@@ -67,8 +70,6 @@
                         gct -s -t bool /desktop/gnome/sound/enable_esd false
                         gct -s -t bool /desktop/gnome/interface/accessibility true
                         gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [orca]
-                        #gct -s -t bool /apps/gnopernicus/srcore/sp_active true
-                        #gct -s -t bool /apps/gnopernicus/srcore/mag_active false
                         ;;
                         # Minor Motor Difficulties
                         access=m1)
@@ -82,6 +83,9 @@
                         gct -s -t int /desktop/gnome/peripherals/keyboard/rate 10
 
                         kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/
+                        if [ -e /root/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
+                            sed -i 's/0/1/' /root/etc/xdg/xfce4/mcs_settings/keyboard.xml
+                        fi 
                         ;;
                         # Motor Difficulties - pointing devices
                         access=m2)
@@ -93,6 +97,9 @@
                         gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [onboard]
 
                         kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/,/usr/share/kubuntu-default-settings/kde-profile/motor-difficulties-pointing-devices/
+                        if [ -e /root/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
+                            sed -i '/Sticky/ s/0/1/' /root/etc/xdg/xfce4/mcs_settings/keyboard.xml
+                        fi 
                         ;;
 		esac
 done

=== modified file 'ubiquity-hooks/30accessibility'
--- ubiquity-hooks/30accessibility	2006-10-23 12:33:48 +0000
+++ ubiquity-hooks/30accessibility	2006-10-23 13:04:46 +0000
@@ -34,23 +34,34 @@
                         gct -s -t int /desktop/gnome/peripherals/mouse/cursor_size 48
                         gct -s -t string /desktop/gnome/peripherals/mouse/cursor_theme whiteglass
                         kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/
+                        if [ -d /target/usr/share/xubuntu-default-settings/accessibility ]; then
+                            cp -a /target/usr/share/xubuntu-default-settings/accessibility/* /target/etc/xdg/
+                        fi
                         ;;
                         # Moderate Visual Impairment
                         access=v2)
                         gct -s -t bool /desktop/gnome/interface/accessibility true
                         gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [orca]
-                        #gct -s -t bool /apps/gnopernicus/srcore/mag_active true
-                        #gct -s -t bool /apps/gnopernicus/srcore/sp_active false
+
+                        if [ -d /usr/share/xubuntu-default-settings ]; then
+                          apt-install gnome-orca gnome-mag
+                        fi
+
+                        if [ -e /target/usr/share/python-support/gnome-orca/orca/settings.py ]; then
+                            sed -i '/^enableSpeech\W/ s/True/False/;/^enableMagnifier/ s/False/True/' /target/usr/share/python-support/gnome-orca/orca/settings.py
+                        fi
+
                         kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/,/usr/share/kubuntu-default-settings/kde-profile/moderate-visual-impairment/
-
                         ;;
                         # Blindness
                         access=v3)
                         gct -s -t bool /desktop/gnome/sound/enable_esd false
                         gct -s -t bool /desktop/gnome/interface/accessibility true
                         gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [orca]
-                        #gct -s -t bool /apps/gnopernicus/srcore/sp_active true
-                        #gct -s -t bool /apps/gnopernicus/srcore/mag_active false
+
+                        if [ -d /usr/share/xubuntu-default-settings ]; then
+                          apt-install gnome-orca
+                        fi
                         ;;
                         # Minor Motor Difficulties
                         access=m1)
@@ -63,6 +74,9 @@
                         gct -s -t int /desktop/gnome/peripherals/keyboard/delay 700
                         gct -s -t int /desktop/gnome/peripherals/keyboard/rate 10
                         kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/
+                        if [ -e /target/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
+                            sed -i 's/0/1/' /target/etc/xdg/xfce4/mcs_settings/keyboard.xml
+                        fi
                         ;;
                         # Motor Difficulties - pointing devices
                         access=m2)
@@ -73,6 +87,9 @@
                         gct -s -t bool /desktop/accessibility/gnome/keyboard/stickykeys_two_key_off false
                         gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [onboard]
                         kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/,/usr/share/kubuntu-default-settings/kde-profile/motor-difficulties-pointing-devices/
+                        if [ -e /target/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
+                            sed -i '/Sticky/ s/0/1/' /target/etc/xdg/xfce4/mcs_settings/keyboard.xml
+                        fi
                         ;;
 		esac
 done