[gentoo-user] New xorg.conf with x11-base/xorg-server-1.5.3-r5

[Mick]

Hi All,

I've emerged the new xorg-server-1.5.3-r5, removed my xorg.conf as advised  
and noticed two things which I am not sure how to fix:

My keyboard layout is no longer UK, but US (I think); i.e. the # symbol is not 
next to the return key, but at Shift+3.  How can I change it back to UK?

I used to have this stanza in my xorg.conf to be able to switch languages:
=====================================================
Section "InputDevice"
        Identifier  "Keyboard0"
        Driver      "kbd"
        Option      "Name" "AT Translated Set 2 keyboard"
        Option      "XkbModel"  "pc105"
        Option      "XkbLayout" "gb,el"
        
Option      "XkbOptions" "grp:alt_shift_toggle,grp_led:scroll,compose:menu"
EndSection
=====================================================

How can I set up the same thing now?
-- 
Regards,
Mick