summaryrefslogtreecommitdiff
path: root/gkb-new/xmodmap.sun
diff options
context:
space:
mode:
authorPerberos <[email protected]>2011-11-16 21:35:41 -0300
committerPerberos <[email protected]>2011-11-16 21:35:41 -0300
commit2eb7f393a623a7e68102813825f68171cbf21fc5 (patch)
tree1cc1a342e7b7c711385b9ba44ec3a57956ef4309 /gkb-new/xmodmap.sun
parent2cadeb84dc64ab8d33dc6cff72e510f2b6038918 (diff)
downloadmate-applets-2eb7f393a623a7e68102813825f68171cbf21fc5.tar.bz2
mate-applets-2eb7f393a623a7e68102813825f68171cbf21fc5.tar.xz
removing empty gswitchit and unused gkb-new
Diffstat (limited to 'gkb-new/xmodmap.sun')
-rw-r--r--gkb-new/xmodmap.sun/Makefile.am74
-rw-r--r--gkb-new/xmodmap.sun/base.xml.in530
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.am125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.az125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.be125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.bg125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.br125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.br-usb247
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.by125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.ca125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.cz125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.de125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.de-type4125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.de-usb247
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.de_CH125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.dk125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.dk-type4125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.dk-usb247
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.ee125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.es125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.es-type4125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.es-usb247
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.fi125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.fr125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.fr-usb247
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.gb125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.gb-type4125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.gb-usb247
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.hu125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.hu-lat1125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.il125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.is125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.it125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.it-type4125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.it-usb247
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.jp125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.jp-type4125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.lt125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.lv125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.mk125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.mn128
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.no125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.pl125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.pt125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.pt-type4125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.ro125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.ru125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.se125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.se-type4125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.se-usb247
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.si125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.sk125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.sr125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.th125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.tr125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.ua125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.us125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.us-type4125
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.us-type6122
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.us-usb247
-rw-r--r--gkb-new/xmodmap.sun/xmodmap.vn125
61 files changed, 0 insertions, 9077 deletions
diff --git a/gkb-new/xmodmap.sun/Makefile.am b/gkb-new/xmodmap.sun/Makefile.am
deleted file mode 100644
index 15829d1c..00000000
--- a/gkb-new/xmodmap.sun/Makefile.am
+++ /dev/null
@@ -1,74 +0,0 @@
-EXTRA_DIST = $(GKB_MAPS) $(xmm_xml_in_file)
-
-gkbmapsdir = $(datadir)/mate-xmodmap
-gkbmaps_DATA = $(GKB_MAPS) $(XMM_XML)
-
-GKB_MAPS = \
- xmodmap.am \
- xmodmap.az \
- xmodmap.be \
- xmodmap.bg \
- xmodmap.br \
- xmodmap.by \
- xmodmap.ca \
- xmodmap.cz \
- xmodmap.de \
- xmodmap.de_CH \
- xmodmap.dk \
- xmodmap.ee \
- xmodmap.es \
- xmodmap.fi \
- xmodmap.fr \
- xmodmap.gb \
- xmodmap.hu \
- xmodmap.hu-lat1 \
- xmodmap.il \
- xmodmap.is \
- xmodmap.it \
- xmodmap.jp \
- xmodmap.lt \
- xmodmap.lv \
- xmodmap.mk \
- xmodmap.mn \
- xmodmap.no \
- xmodmap.pl \
- xmodmap.pt \
- xmodmap.ro \
- xmodmap.ru \
- xmodmap.se \
- xmodmap.si \
- xmodmap.sk \
- xmodmap.sr \
- xmodmap.th \
- xmodmap.tr \
- xmodmap.ua \
- xmodmap.us \
- xmodmap.vn \
- xmodmap.br-usb \
- xmodmap.de-usb \
- xmodmap.dk-usb \
- xmodmap.es-usb \
- xmodmap.fr-usb \
- xmodmap.gb-usb \
- xmodmap.it-usb \
- xmodmap.se-usb \
- xmodmap.us-usb \
- xmodmap.de-type4 \
- xmodmap.dk-type4 \
- xmodmap.es-type4 \
- xmodmap.gb-type4 \
- xmodmap.it-type4 \
- xmodmap.jp-type4 \
- xmodmap.pt-type4 \
- xmodmap.se-type4 \
- xmodmap.us-type4 \
- xmodmap.us-type6
-
-xmm_xml_in_file = base.xml.in
-XMM_XML = $(xmm_xml_in_file:.xml.in=.xml)
-
-%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po)
- $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -x -u \
- -c $(top_srcdir)/po/.intltool-merge-cache
-
--include $(top_srcdir)/git.mk
diff --git a/gkb-new/xmodmap.sun/base.xml.in b/gkb-new/xmodmap.sun/base.xml.in
deleted file mode 100644
index b4a0724f..00000000
--- a/gkb-new/xmodmap.sun/base.xml.in
+++ /dev/null
@@ -1,530 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xkbConfigRegistry SYSTEM "xkb.dtd">
-<xkbConfigRegistry>
- <modelList>
- <model>
- <configItem>
- <name>generic</name>
- <_description>Generic Keyboard</_description>
- </configItem>
- </model>
- </modelList>
- <layoutList>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Armenian Sun keymap</_shortDescription>
- <_description>Armenian Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Azerbaijani Turkish Sun keymap</_shortDescription>
- <_description>Azerbaijani Turkish Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Dutch Sun keymap</_shortDescription>
- <_description>Dutch Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Bulgarian Sun keymap</_shortDescription>
- <_description>Bulgarian Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Brazil Portuguese Sun USB keymap</_shortDescription>
- <_description>Brazil Portuguese Sun USB keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Brazil Portuguese Sun keymap</_shortDescription>
- <_description>Brazil Portuguese Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Belarusian Sun keymap</_shortDescription>
- <_description>Belarusian Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Canadian Sun keymap</_shortDescription>
- <_description>Canadian Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Swiss German Sun keymap</_shortDescription>
- <_description>Swiss German Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Czech Sun keymap</_shortDescription>
- <_description>Czech Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>German Sun Type-4 keymap</_shortDescription>
- <_description>German Sun Type-4 keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>German Sun USB keymap</_shortDescription>
- <_description>German Sun USB keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>German Sun keymap</_shortDescription>
- <_description>German Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Danish Sun Type-4 keymap</_shortDescription>
- <_description>Danish Sun Type-4 keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Danish Sun USB keymap</_shortDescription>
- <_description>Danish Sun USB keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Danish Sun keymap</_shortDescription>
- <_description>Danish Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Estonian Sun keymap</_shortDescription>
- <_description>Estonian Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Spanish Sun Type-4 keymap</_shortDescription>
- <_description>Spanish Sun Type-4 keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Spanish Sun USB keymap</_shortDescription>
- <_description>Spanish Sun USB keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Spanish Sun keymap</_shortDescription>
- <_description>Spanish Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Finnish Sun keymap</_shortDescription>
- <_description>Finnish Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>French Sun USB keymap</_shortDescription>
- <_description>French Sun USB keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>French Sun keymap</_shortDescription>
- <_description>French Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>British Sun Type-4 keymap</_shortDescription>
- <_description>British Sun Type-4 keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>British Sun USB keymap</_shortDescription>
- <_description>British Sun USB keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>British Sun keymap</_shortDescription>
- <_description>British Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Hungarian latin2 Sun keymap</_shortDescription>
- <_description>Hungarian latin2 Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Hungarian type5 latin 1 keymap</_shortDescription>
- <_description>Hungarian type5 latin 1 keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Hebrew Sun keymap</_shortDescription>
- <_description>Hebrew Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Icelandic Sun keymap</_shortDescription>
- <_description>Icelandic Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Italian Sun Type-4 keymap</_shortDescription>
- <_description>Italian Sun Type-4 keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Italian Sun USB keymap</_shortDescription>
- <_description>Italian Sun USB keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Italian Sun keymap</_shortDescription>
- <_description>Italian Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Japanese Sun Type-4 keymap</_shortDescription>
- <_description>Japanese Sun Type-4 keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Japanese Sun keymap</_shortDescription>
- <_description>Japanese Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Lithuanian Sun keymap</_shortDescription>
- <_description>Lithuanian Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Latvian Sun keymap</_shortDescription>
- <_description>Latvian Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Macedonian Sun keymap</_shortDescription>
- <_description>Macedonian Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Norwegian Sun keymap</_shortDescription>
- <_description>Norwegian Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Polish Sun keymap</_shortDescription>
- <_description>Polish Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Portuguese Sun Type-4 keymap</_shortDescription>
- <_description>Portuguese Sun Type-4 keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Portuguese Sun keymap</_shortDescription>
- <_description>Portuguese Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Romanian Sun keymap</_shortDescription>
- <_description>Romanian Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Russian Sun keymap</_shortDescription>
- <_description>Russian Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Swedish Sun Type-4 keymap</_shortDescription>
- <_description>Swedish Sun Type-4 keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Swedish Sun USB keymap</_shortDescription>
- <_description>Swedish Sun USB keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Swedish Sun keymap</_shortDescription>
- <_description>Swedish Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Slovenian Sun keymap</_shortDescription>
- <_description>Slovenian Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Slovenian Sun keymap</_shortDescription>
- <_description>Slovenian Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Slovak Sun keymap</_shortDescription>
- <_description>Slovak Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Serbian Sun standard keymap</_shortDescription>
- <_description>Serbian Sun standard keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Thai Sun keymap</_shortDescription>
- <_description>Thai Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Turkish Sun keymap</_shortDescription>
- <_description>Turkish Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Ukrainian Sun keymap</_shortDescription>
- <_description>Ukrainian Sun keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>US Sun type5 keymap</_shortDescription>
- <_description>US Sun type5 keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>US Sun Type-4 keymap</_shortDescription>
- <_description>US Sun Type-4 keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>US Sun USB keymap</_shortDescription>
- <_description>US Sun USB keymap</_description>
- </configItem>
- </layout>
- <layout>
- <configItem>
- <name></name>
- <_shortDescription>Vietnamese Sun keymap</_shortDescription>
- <_description>Vietnamese Sun keymap</_description>
- </configItem>
- </layout>
- </layoutList>
- <optionList>
- <group allowMultipleSelection="false">
- <configItem>
- <name>grp</name>
- <_description>Layout shift behavior</_description>
- </configItem>
- <option>
- <configItem>
- <name>grp:ralt_toggle</name>
- <_description>Right Alt key changes layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:lalt_toggle</name>
- <_description>Left Alt key changes layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:caps_toggle</name>
- <_description>CapsLock key changes layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:shift_caps_toggle</name>
- <_description>Shift+CapsLock changes layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:shifts_toggle</name>
- <_description>Both Shift keys together change layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:alts_toggle</name>
- <_description>Both Alt keys together change layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:ctrls_toggle</name>
- <_description>Both Ctrl keys together change layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:ctrl_shift_toggle</name>
- <_description>Control+Shift changes layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:ctrl_alt_toggle</name>
- <_description>Alt+Control changes layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:alt_shift_toggle</name>
- <_description>Alt+Shift changes layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:menu_toggle</name>
- <_description>Menu key changes layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:lwin_toggle</name>
- <_description>Left Win-key changes layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:rwin_toggle</name>
- <_description>Right Win-key changes layout.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:lshift_toggle</name>
- <_description>Left Shift key changes group.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:rshift_toggle</name>
- <_description>Right Shift key changes group.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:lctrl_toggle</name>
- <_description>Left Ctrl key changes group.</_description>
- </configItem>
- </option>
- <option>
- <configItem>
- <name>grp:rctrl_toggle</name>
- <_description>Right Ctrl key changes group.</_description>
- </configItem>
- </option>
- </group>
- </optionList>
-</xkbConfigRegistry>
diff --git a/gkb-new/xmodmap.sun/xmodmap.am b/gkb-new/xmodmap.sun/xmodmap.am
deleted file mode 100644
index 52b03df5..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.am
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam Armenian_fe Armenian_FE
-keycode 38 = 2 at Armenian_dza Armenian_DZA
-keycode 39 = 3 numbersign Armenian_en_dash Armenian_em_dash
-keycode 40 = 4 dollar Armenian_comma dollar
-keycode 41 = 5 percent Armenian_full_stop Armenian_ellipsis
-keycode 42 = 6 asciicircum Armenian_question percent
-keycode 43 = 7 ampersand Armenian_dot Armenian_ligature_ew
-keycode 44 = 8 asterisk Armenian_accent
-keycode 45 = 9 parenleft Armenian_parenright Armenian_parenleft
-keycode 46 = 0 parenright Armenian_o Armenian_O
-keycode 47 = minus underscore Armenian_e Armenian_E
-keycode 48 = equal plus Armenian_ghat Armenian_GHAT
-keycode 49 = grave asciitilde Armenian_separation_mark Armenian_exclam
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q Armenian_tche Armenian_TCHE
-keycode 62 = w W Armenian_pyur Armenian_PYUR
-keycode 63 = e E Armenian_ben Armenian_BEN
-keycode 64 = r R Armenian_se Armenian_SE
-keycode 65 = t T Armenian_men Armenian_MEN
-keycode 66 = y Y Armenian_vo Armenian_VO
-keycode 67 = u U Armenian_vyun Armenian_VYUN
-keycode 68 = i I Armenian_ken Armenian_KEN
-keycode 69 = o O Armenian_at Armenian_AT
-keycode 70 = p P Armenian_to Armenian_TO
-keycode 71 = bracketleft braceleft Armenian_tsa Armenian_TSA
-keycode 72 = bracketright braceright Armenian_tso Armenian_TSO
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A Armenian_je Armenian_JE
-keycode 85 = s S Armenian_vev Armenian_VEV
-keycode 86 = d D Armenian_gim Armenian_GIM
-keycode 87 = f F Armenian_yech Armenian_YECH
-keycode 88 = g G Armenian_ayb Armenian_AYB
-keycode 89 = h H Armenian_nu Armenian_NU
-keycode 90 = j J Armenian_ini Armenian_INI
-keycode 91 = k K Armenian_tyun Armenian_TYUN
-keycode 92 = l L Armenian_ho Armenian_HO
-keycode 93 = semicolon colon Armenian_pe Armenian_PE
-keycode 94 = apostrophe quotedbl Armenian_re Armenian_RE
-keycode 95 = backslash bar Armenian_guillemotright Armenian_guillemotleft
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z Armenian_zhe Armenian_ZHE
-keycode 108 = x X Armenian_da Armenian_DA
-keycode 109 = c C Armenian_cha Armenian_CHA
-keycode 110 = v V Armenian_hi Armenian_HI
-keycode 111 = b B Armenian_za Armenian_ZA
-keycode 112 = n N Armenian_lyun Armenian_LYUN
-keycode 113 = m M Armenian_ke Armenian_KE
-keycode 114 = comma less Armenian_khe Armenian_KHE
-keycode 115 = period greater Armenian_sha Armenian_SHA
-keycode 116 = slash question Armenian_ra Armenian_RA
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.az b/gkb-new/xmodmap.sun/xmodmap.az
deleted file mode 100644
index 388575ba..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.az
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl at
-keycode 39 = 3 apostrophe slash
-keycode 40 = 4 semicolon dollar
-keycode 41 = 5 percent sterling
-keycode 42 = 6 colon EuroSign periodcentered
-keycode 43 = 7 question ampersand
-keycode 44 = 8 asterisk asciicircum dead_circumflex
-keycode 45 = 9 parenleft numbersign
-keycode 46 = 0 parenright section
-keycode 47 = minus underscore hyphen
-keycode 48 = equal plus
-keycode 49 = grave asciitilde dead_grave dead_tilde
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = udiaeresis Udiaeresis w W
-keycode 63 = e E e E
-keycode 64 = r R registered
-keycode 65 = t T brokenbar brokenbar
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i Iabovedot
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = odiaeresis Odiaeresis bracketleft braceleft
-keycode 72 = gbreve Gbreve bracketright braceright
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = idotless I semicolon colon
-keycode 94 = schwa SCHWA apostrophe quotedbl
-keycode 95 = gcaron Gcaron backslash bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z
-keycode 108 = x X
-keycode 109 = c C copyright division
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M periodcentered currency
-keycode 114 = ccedilla Ccedilla comma less
-keycode 115 = scedilla Scedilla period greater
-keycode 116 = period comma
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.be b/gkb-new/xmodmap.sun/xmodmap.be
deleted file mode 100644
index 94e7c2c0..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.be
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = ampersand 1 bar
-keycode 38 = eacute 2 at
-keycode 39 = quotedbl 3 numbersign
-keycode 40 = apostrophe 4
-keycode 41 = parenleft 5
-keycode 42 = section 6 asciicircum
-keycode 43 = egrave 7
-keycode 44 = exclam 8
-keycode 45 = ccedilla 9 braceleft plusminus
-keycode 46 = agrave 0 braceright degree
-keycode 47 = parenright degree
-keycode 48 = minus underscore
-keycode 49 = twosuperior threesuperior acute
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = a A
-keycode 62 = z Z
-keycode 63 = e E EuroSign cent
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = dead_circumflex dead_diaeresis bracketleft
-keycode 72 = dollar asterisk bracketright
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = q Q
-keycode 85 = s S
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = m M
-keycode 94 = ugrave percent dead_acute
-keycode 95 = mu sterling dead_grave
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = w W
-keycode 108 = x X
-keycode 109 = c C
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = comma question dead_cedilla
-keycode 114 = semicolon period
-keycode 115 = colon slash
-keycode 116 = equal plus dead_tilde
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.bg b/gkb-new/xmodmap.sun/xmodmap.bg
deleted file mode 100644
index 7f37c50f..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.bg
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Alt_R Meta_R
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam 1 exclam multiply multiply
-keycode 38 = 2 at 2 question division division
-keycode 39 = 3 numbersign 3 plus plusminus plusminus
-keycode 40 = 4 dollar 4 quotedbl notsign notsign
-keycode 41 = 5 percent 5 percent
-keycode 42 = 6 asciicircum 6 equal notequal notequal
-keycode 43 = 7 ampersand 7 colon ampersand ampersand
-keycode 44 = 8 asterisk 8 slash asterisk asterisk
-keycode 45 = 9 parenleft 9 emdash bracketleft bracketleft
-keycode 46 = 0 parenright 0 numerosign bracketright bracketright
-keycode 47 = minus underscore minus I X X
-keycode 48 = equal plus period V L L
-keycode 49 = grave asciitilde parenleft parenright degree degree
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q comma Cyrillic_yeru apostrophe apostrophe
-keycode 62 = w W Cyrillic_u Cyrillic_U grave grave
-keycode 63 = e E Cyrillic_ie Cyrillic_IE EuroSign EuroSign
-keycode 64 = r R Cyrillic_i Cyrillic_I registered registered
-keycode 65 = t T Cyrillic_sha Cyrillic_SHA trademark trademark
-keycode 66 = y Y Cyrillic_shcha Cyrillic_SHCHA yen yen
-keycode 67 = u U Cyrillic_ka Cyrillic_KA doublelowquotemark doublelowquotemark
-keycode 68 = i I Cyrillic_es Cyrillic_ES leftdoublequotemark leftdoublequotemark
-keycode 69 = o O Cyrillic_de Cyrillic_DE rightdoublequotemark rightdoublequotemark
-keycode 70 = p P Cyrillic_ze Cyrillic_ZE
-keycode 71 = bracketleft braceleft Cyrillic_tse Cyrillic_TSE braceleft braceleft
-keycode 72 = bracketright braceright semicolon section braceright braceright
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A Cyrillic_softsign Cyrillic_SOFTSIGN mu mu
-keycode 85 = s S Cyrillic_ya Cyrillic_YA sterling sterling
-keycode 86 = d D Cyrillic_a Cyrillic_A dollar dollar
-keycode 87 = f F Cyrillic_o Cyrillic_O cent cent
-keycode 88 = g G Cyrillic_zhe Cyrillic_ZHE Cyrillic_yeru Cyrillic_yeru
-keycode 89 = h H Cyrillic_ghe Cyrillic_GHE Cyrillic_YERU Cyrillic_YERU
-keycode 90 = j J Cyrillic_te Cyrillic_TE Cyrillic_e Cyrillic_e
-keycode 91 = k K Cyrillic_en Cyrillic_EN Cyrillic_E Cyrillic_E
-keycode 92 = l L Cyrillic_ve Cyrillic_VE numerosign numerosign
-keycode 93 = semicolon colon Cyrillic_em Cyrillic_EM section section
-keycode 94 = apostrophe quotedbl Cyrillic_che Cyrillic_CHE ellipsis ellipsis
-keycode 95 = backslash bar apostrophe Cyrillic_YERU bar bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z Cyrillic_yu Cyrillic_YU emdash emdash
-keycode 108 = x X Cyrillic_shorti Cyrillic_SHORTI endash endash
-keycode 109 = c C Cyrillic_hardsign Cyrillic_HARDSIGN copyright copyright
-keycode 110 = v V Cyrillic_e Cyrillic_E
-keycode 111 = b B Cyrillic_ef Cyrillic_EF
-keycode 112 = n N Cyrillic_ha Cyrillic_HA less less
-keycode 113 = m M Cyrillic_pe Cyrillic_PE greater greater
-keycode 114 = comma less Cyrillic_er Cyrillic_ER guillemotleft guillemotleft
-keycode 115 = period greater Cyrillic_el Cyrillic_EL guillemotright guillemotright
-keycode 116 = slash question Cyrillic_be Cyrillic_BE backslash backslash
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space space NoSymbol NoSymbol nobreakspace
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.br b/gkb-new/xmodmap.sun/xmodmap.br
deleted file mode 100644
index 20741cfb..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.br
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch Multi_key
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam onesuperior exclamdown
-keycode 38 = 2 at twosuperior onehalf
-keycode 39 = 3 numbersign threesuperior threequarters
-keycode 40 = 4 dollar sterling onequarter
-keycode 41 = 5 percent cent
-keycode 42 = 6 dead_diaeresis notsign diaeresis
-keycode 43 = 7 ampersand braceleft
-keycode 44 = 8 asterisk bracketleft
-keycode 45 = 9 parenleft bracketright
-keycode 46 = 0 parenright braceright
-keycode 47 = minus underscore backslash
-keycode 48 = equal plus section
-keycode 49 = apostrophe quotedbl acute
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete comma
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = w W
-keycode 63 = e E EuroSign
-keycode 64 = r R registered
-keycode 65 = t T
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = dead_acute dead_grave acute grave
-keycode 72 = bracketleft braceleft ordfeminine
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = ccedilla Ccedilla
-keycode 94 = dead_tilde dead_circumflex asciitilde asciicircum
-keycode 95 = backslash bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z
-keycode 108 = x X
-keycode 109 = c C copyright
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M mu
-keycode 114 = comma less
-keycode 115 = period greater
-keycode 116 = semicolon colon
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.br-usb b/gkb-new/xmodmap.sun/xmodmap.br-usb
deleted file mode 100644
index 5bb48be9..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.br-usb
+++ /dev/null
@@ -1,247 +0,0 @@
-keycode 8 =
-keycode 9 =
-keycode 10 =
-keycode 11 = A
-keycode 12 = B
-keycode 13 = C
-keycode 14 = D
-keycode 15 = e E currency
-keycode 16 = F
-keycode 17 = G
-keycode 18 = H
-keycode 19 = I
-keycode 20 = J
-keycode 21 = K
-keycode 22 = L
-keycode 23 = M
-keycode 24 = N
-keycode 25 = O
-keycode 26 = P
-keycode 27 = Q
-keycode 28 = R
-keycode 29 = S
-keycode 30 = T
-keycode 31 = U
-keycode 32 = V
-keycode 33 = W
-keycode 34 = X
-keycode 35 = Y
-keycode 36 = Z
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl at
-keycode 39 = 3 numbersign sterling
-keycode 40 = 4 dollar section
-keycode 41 = 5 percent asciitilde
-keycode 42 = 6 ampersand asciicircum
-keycode 43 = 7 slash braceleft
-keycode 44 = 8 parenleft bracketleft
-keycode 45 = 9 parenright bracketright
-keycode 46 = 0 equal braceright
-keycode 47 = Return
-keycode 48 = Escape
-keycode 49 = BackSpace
-keycode 50 = Tab
-keycode 51 = space
-keycode 52 = quoteright question quoteleft
-keycode 53 = guillemotleft guillemotright
-keycode 54 = plus asterisk SunFA_Diaeresis
-keycode 55 = SunFA_Acute SunFA_Grave
-keycode 56 =
-keycode 57 = SunFA_Tilde SunFA_Circum
-keycode 58 = Ccedilla
-keycode 59 = masculine ordfeminine
-keycode 60 = backslash bar
-keycode 61 = comma semicolon
-keycode 62 = period colon
-keycode 63 = minus underscore
-keycode 64 = Caps_Lock
-keycode 65 = F1
-keycode 66 = F2
-keycode 67 = F3
-keycode 68 = F4
-keycode 69 = F5
-keycode 70 = F6
-keycode 71 = F7
-keycode 72 = F8
-keycode 73 = F9
-keycode 74 = F10
-keycode 75 = SunF36
-keycode 76 = SunF37
-keycode 77 = R2 R2 Print SunSys_Req
-keycode 78 = R3 R3 Scroll_Lock
-keycode 79 = R1 R1 Pause Break
-keycode 80 = Insert
-keycode 81 = Home
-keycode 82 = Prior
-keycode 83 = Delete
-keycode 84 = End
-keycode 85 = Next
-keycode 86 = Right
-keycode 87 = Left
-keycode 88 = Down
-keycode 89 = Up
-keycode 90 = Num_Lock
-keycode 91 = R5 R5 KP_Divide
-keycode 92 = R6 R6 KP_Multiply
-keycode 93 = R4 R4 KP_Subtract
-keycode 94 = KP_Add
-keycode 95 = KP_Enter
-keycode 96 = R13 R13 KP_1 End
-keycode 97 = Down R14 KP_2
-keycode 98 = R15 R15 KP_3 Next
-keycode 99 = Left R10 KP_4
-keycode 100 = R11 R11 KP_5
-keycode 101 = Right R12 KP_6
-keycode 102 = R7 R7 KP_7 Home
-keycode 103 = Up R8 KP_8
-keycode 104 = R9 R9 KP_9 Prior
-keycode 105 = KP_Insert KP_Insert KP_0
-keycode 106 = Delete Delete KP_Decimal
-keycode 107 = less greater
-keycode 108 = SunCompose
-keycode 109 = SunPowerSwitch SunPowerSwitchShift
-keycode 110 =
-keycode 111 =
-keycode 112 =
-keycode 113 =
-keycode 114 =
-keycode 115 =
-keycode 116 =
-keycode 117 =
-keycode 118 =
-keycode 119 =
-keycode 120 =
-keycode 121 =
-keycode 122 =
-keycode 123 = L7 L7 SunOpen
-keycode 124 = Help
-keycode 125 = L3 L3 SunProps
-keycode 126 = L5 L5 SunFront
-keycode 127 = L1 L1 SunStop
-keycode 128 = L2 L2 SunAgain
-keycode 129 = L4 L4 SunUndo
-keycode 130 = L10 L10 SunCut
-keycode 131 = L6 L6 SunCopy
-keycode 132 = L8 L8 SunPaste
-keycode 133 = L9 L9 SunFind
-keycode 134 = SunAudioMute SunVideoDegauss
-keycode 135 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 136 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 137 =
-keycode 138 =
-keycode 139 =
-keycode 140 =
-keycode 141 =
-keycode 142 =
-keycode 143 =
-keycode 144 =
-keycode 145 =
-keycode 146 =
-keycode 147 =
-keycode 148 =
-keycode 149 =
-keycode 150 =
-keycode 151 =
-keycode 152 =
-keycode 153 =
-keycode 154 =
-keycode 155 =
-keycode 156 =
-keycode 157 =
-keycode 158 =
-keycode 159 =
-keycode 160 =
-keycode 161 =
-keycode 162 =
-keycode 163 =
-keycode 164 =
-keycode 165 =
-keycode 166 =
-keycode 167 =
-keycode 168 =
-keycode 169 =
-keycode 170 =
-keycode 171 =
-keycode 172 =
-keycode 173 =
-keycode 174 =
-keycode 175 =
-keycode 176 =
-keycode 177 =
-keycode 178 =
-keycode 179 =
-keycode 180 =
-keycode 181 =
-keycode 182 =
-keycode 183 =
-keycode 184 =
-keycode 185 =
-keycode 186 =
-keycode 187 =
-keycode 188 =
-keycode 189 =
-keycode 190 =
-keycode 191 =
-keycode 192 =
-keycode 193 =
-keycode 194 =
-keycode 195 =
-keycode 196 =
-keycode 197 =
-keycode 198 =
-keycode 199 =
-keycode 200 =
-keycode 201 =
-keycode 202 =
-keycode 203 =
-keycode 204 =
-keycode 205 =
-keycode 206 =
-keycode 207 =
-keycode 208 =
-keycode 209 =
-keycode 210 =
-keycode 211 =
-keycode 212 =
-keycode 213 =
-keycode 214 =
-keycode 215 =
-keycode 216 =
-keycode 217 =
-keycode 218 =
-keycode 219 =
-keycode 220 =
-keycode 221 =
-keycode 222 =
-keycode 223 =
-keycode 224 =
-keycode 225 =
-keycode 226 =
-keycode 227 =
-keycode 228 =
-keycode 229 =
-keycode 230 =
-keycode 231 = Control_L
-keycode 232 = Shift_L
-keycode 233 = Alt_L
-keycode 234 = Meta_L
-keycode 235 =
-keycode 236 = Shift_R
-keycode 237 = SunAltGraph
-keycode 238 = Meta_R
-keycode 239 =
-keycode 240 =
-keycode 241 =
-keycode 242 =
-keycode 243 =
-keycode 244 =
-keycode 245 =
-keycode 246 =
-keycode 247 =
-keycode 248 =
-keycode 249 =
-keycode 250 =
-keycode 251 =
-keycode 252 =
-keycode 253 =
-keycode 254 =
diff --git a/gkb-new/xmodmap.sun/xmodmap.by b/gkb-new/xmodmap.sun/xmodmap.by
deleted file mode 100644
index ac7663d4..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.by
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam 1 exclam
-keycode 38 = 2 at 2 quotedbl
-keycode 39 = 3 numbersign 3 numbersign
-keycode 40 = 4 dollar 4 semicolon
-keycode 41 = 5 percent 5 percent
-keycode 42 = 6 asciicircum 6 colon
-keycode 43 = 7 ampersand 7 question
-keycode 44 = 8 asterisk 8 asterisk
-keycode 45 = 9 parenleft 9 parenleft
-keycode 46 = 0 parenright 0 parenright
-keycode 47 = minus underscore minus underscore
-keycode 48 = equal plus equal plus
-keycode 49 = grave asciitilde Cyrillic_io Cyrillic_IO
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q Cyrillic_shorti Cyrillic_SHORTI
-keycode 62 = w W Cyrillic_tse Cyrillic_TSE
-keycode 63 = e E Cyrillic_u Cyrillic_U
-keycode 64 = r R Cyrillic_ka Cyrillic_KA
-keycode 65 = t T Cyrillic_ie Cyrillic_IE
-keycode 66 = y Y Cyrillic_en Cyrillic_EN
-keycode 67 = u U Cyrillic_ghe Cyrillic_GHE
-keycode 68 = i I Cyrillic_sha Cyrillic_SHA
-keycode 69 = o O Byelorussian_shortu Byelorussian_SHORTU
-keycode 70 = p P Cyrillic_ze Cyrillic_ZE
-keycode 71 = bracketleft braceleft Cyrillic_ha Cyrillic_HA
-keycode 72 = bracketright braceright apostrophe apostrophe
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A Cyrillic_ef Cyrillic_EF
-keycode 85 = s S Cyrillic_yeru Cyrillic_YERU
-keycode 86 = d D Cyrillic_ve Cyrillic_VE
-keycode 87 = f F Cyrillic_a Cyrillic_A
-keycode 88 = g G Cyrillic_pe Cyrillic_PE
-keycode 89 = h H Cyrillic_er Cyrillic_ER
-keycode 90 = j J Cyrillic_o Cyrillic_O
-keycode 91 = k K Cyrillic_el Cyrillic_EL
-keycode 92 = l L Cyrillic_de Cyrillic_DE
-keycode 93 = semicolon colon Cyrillic_zhe Cyrillic_ZHE
-keycode 94 = apostrophe quotedbl Cyrillic_e Cyrillic_E
-keycode 95 = backslash bar slash bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z Cyrillic_ya Cyrillic_YA
-keycode 108 = x X Cyrillic_che Cyrillic_CHE
-keycode 109 = c C Cyrillic_es Cyrillic_ES
-keycode 110 = v V Cyrillic_em Cyrillic_EM
-keycode 111 = b B Ukrainian_i Ukrainian_I
-keycode 112 = n N Cyrillic_te Cyrillic_TE
-keycode 113 = m M Cyrillic_softsign Cyrillic_SOFTSIGN
-keycode 114 = comma less Cyrillic_be Cyrillic_BE
-keycode 115 = period greater Cyrillic_yu Cyrillic_YU
-keycode 116 = slash question period comma
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.ca b/gkb-new/xmodmap.sun/xmodmap.ca
deleted file mode 100644
index c5903ae4..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.ca
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 at
-keycode 39 = 3 numbersign
-keycode 40 = 4 dollar onequarter currency
-keycode 41 = 5 percent
-keycode 42 = 6 question threequarters fiveeighths
-keycode 43 = 7 ampersand 7 seveneighths braceleft
-keycode 44 = 8 asterisk 8 trademark braceright
-keycode 45 = 9 parenleft 9 plusminus bracketleft
-keycode 46 = 0 parenright 0 parenright bracketright bracketright
-keycode 47 = minus underscore minus questiondown
-keycode 48 = equal plus dead_cedilla dead_ogonek notsign
-keycode 49 = slash backslash acute hyphen bar
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = w W
-keycode 63 = e E
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = dead_circumflex dead_diaeresis NoSymbol dead_abovering dead_grave
-keycode 72 = ccedilla Ccedilla dead_tilde dead_macron asciitilde
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S
-keycode 86 = d D eth Dstroke
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K kra
-keycode 92 = l L
-keycode 93 = semicolon colon dead_acute dead_doubleacute degree
-keycode 94 = egrave Egrave acute dead_caron
-keycode 95 = agrave Agrave NoSymbol dead_breve
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z z Z guillemotleft guillemotleft
-keycode 108 = x X x X guillemotright guillemotright
-keycode 109 = c C
-keycode 110 = v V leftdoublequotemark leftsinglequotemark
-keycode 111 = b B rightdoublequotemark rightsinglequotemark
-keycode 112 = n N
-keycode 113 = m M
-keycode 114 = comma apostrophe horizconnector multiply less
-keycode 115 = period quotedbl periodcentered division greater
-keycode 116 = eacute Eacute NoSymbol dead_abovedot
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.cz b/gkb-new/xmodmap.sun/xmodmap.cz
deleted file mode 100644
index abde52df..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.cz
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = ISO_Level3_Shift ISO_Level3_Shift
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = plus 1 NoSymbol NoSymbol exclam dead_tilde
-keycode 38 = ecaron 2 NoSymbol NoSymbol at dead_caron
-keycode 39 = scaron 3 NoSymbol NoSymbol numbersign dead_circumflex
-keycode 40 = ccaron 4 NoSymbol NoSymbol dollar dead_breve
-keycode 41 = rcaron 5 NoSymbol NoSymbol percent dead_abovering
-keycode 42 = zcaron 6 NoSymbol NoSymbol asciicircum dead_ogonek
-keycode 43 = yacute 7 NoSymbol NoSymbol ampersand dead_grave
-keycode 44 = aacute 8 NoSymbol NoSymbol asterisk dead_abovedot
-keycode 45 = iacute 9 NoSymbol NoSymbol braceleft dead_acute
-keycode 46 = eacute 0 NoSymbol NoSymbol braceright dead_doubleacute
-keycode 47 = equal percent NoSymbol NoSymbol NoSymbol dead_diaeresis
-keycode 48 = dead_acute dead_caron NoSymbol NoSymbol dead_macron dead_cedilla
-keycode 49 = semicolon dead_abovering acute NoSymbol grave asciitilde
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete comma NoSymbol NoSymbol KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q NoSymbol NoSymbol backslash
-keycode 62 = w W NoSymbol NoSymbol bar
-keycode 63 = e E NoSymbol NoSymbol EuroSign
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = z Z
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = uacute slash NoSymbol NoSymbol bracketleft division
-keycode 72 = parenright parenleft NoSymbol NoSymbol bracketright multiply
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A NoSymbol NoSymbol asciitilde
-keycode 85 = s S NoSymbol NoSymbol dstroke
-keycode 86 = d D NoSymbol NoSymbol Dstroke
-keycode 87 = f F NoSymbol NoSymbol bracketleft
-keycode 88 = g G NoSymbol NoSymbol bracketright
-keycode 89 = h H NoSymbol NoSymbol grave
-keycode 90 = j J NoSymbol NoSymbol apostrophe
-keycode 91 = k K NoSymbol NoSymbol lstroke
-keycode 92 = l L NoSymbol NoSymbol Lstroke
-keycode 93 = uring quotedbl NoSymbol NoSymbol dollar
-keycode 94 = section exclam acute NoSymbol apostrophe ssharp
-keycode 95 = dead_diaeresis apostrophe NoSymbol NoSymbol backslash bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = y Y NoSymbol NoSymbol degree
-keycode 108 = x X NoSymbol NoSymbol numbersign
-keycode 109 = c C NoSymbol NoSymbol ampersand
-keycode 110 = v V NoSymbol NoSymbol at
-keycode 111 = b B NoSymbol NoSymbol braceleft
-keycode 112 = n N NoSymbol NoSymbol braceright
-keycode 113 = m M NoSymbol NoSymbol asciicircum
-keycode 114 = comma question NoSymbol NoSymbol less
-keycode 115 = period colon NoSymbol NoSymbol greater
-keycode 116 = minus underscore NoSymbol NoSymbol asterisk
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space space NoSymbol NoSymbol nobreakspace nobreakspace
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.de b/gkb-new/xmodmap.sun/xmodmap.de
deleted file mode 100644
index ff2b7aa0..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.de
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch Multi_key
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl twosuperior
-keycode 39 = 3 section threesuperior sterling
-keycode 40 = 4 dollar onequarter currency
-keycode 41 = 5 percent onehalf
-keycode 42 = 6 ampersand threequarters
-keycode 43 = 7 slash braceleft
-keycode 44 = 8 parenleft bracketleft
-keycode 45 = 9 parenright bracketright plusminus
-keycode 46 = 0 equal braceright degree
-keycode 47 = ssharp question backslash questiondown
-keycode 48 = dead_acute dead_grave dead_cedilla
-keycode 49 = dead_circumflex degree notsign
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q at
-keycode 62 = w W
-keycode 63 = e E EuroSign
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = z Z
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = udiaeresis Udiaeresis dead_diaeresis
-keycode 72 = plus asterisk dead_tilde dead_macron
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = odiaeresis Odiaeresis dead_acute
-keycode 94 = adiaeresis Adiaeresis dead_circumflex
-keycode 95 = numbersign apostrophe dead_grave
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = y Y guillemotleft less
-keycode 108 = x X
-keycode 109 = c C
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M mu
-keycode 114 = comma semicolon
-keycode 115 = period colon periodcentered division
-keycode 116 = minus underscore
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.de-type4 b/gkb-new/xmodmap.sun/xmodmap.de-type4
deleted file mode 100644
index 3761e529..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.de-type4
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = L1 L1 SunStop
-keycode 9 =
-keycode 10 = L2 L2 SunAgain
-keycode 11 =
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = SunF36
-keycode 17 = F4
-keycode 18 = SunF37
-keycode 19 = F5
-keycode 20 = Alt_R
-keycode 21 = F6
-keycode 22 = bracketright braceright guillemotright
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = SunAltGraph
-keycode 27 =
-keycode 28 = R1 R1 Pause
-keycode 29 = R2 R2 Print
-keycode 30 = R3 R3 Scroll_Lock Break
-keycode 31 =
-keycode 32 = L3 L3 SunProps
-keycode 33 = L4 L4 SunUndo
-keycode 34 =
-keycode 35 =
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl twosuperior
-keycode 39 = 3 section threesuperior
-keycode 40 = 4 dollar
-keycode 41 = 5 percent
-keycode 42 = 6 ampersand
-keycode 43 = 7 slash degree
-keycode 44 = 8 parenleft quoteleft
-keycode 45 = 9 parenright quoteright
-keycode 46 = 0 equal bar
-keycode 47 = ssharp question backslash
-keycode 48 = SunFA_Acute SunFA_Grave
-keycode 49 = numbersign asciicircum at
-keycode 50 = BackSpace
-keycode 51 =
-keycode 52 = R4 R4 KP_Equal
-keycode 53 = R5 R5 KP_Divide
-keycode 54 = R6 R6 KP_Multiply
-keycode 55 =
-keycode 56 = L5 L5 SunFront
-keycode 57 = Delete Delete KP_Decimal
-keycode 58 = L6 L6 SunCopy
-keycode 59 =
-keycode 60 = Tab
-keycode 61 = Q
-keycode 62 = W
-keycode 63 = e E currency
-keycode 64 = R
-keycode 65 = T
-keycode 66 = Z
-keycode 67 = U
-keycode 68 = I
-keycode 69 = O
-keycode 70 = P
-keycode 71 = Udiaeresis
-keycode 72 = plus asterisk asciitilde
-keycode 73 = Delete
-keycode 74 = SunCompose
-keycode 75 = R7 R7 KP_7 Home
-keycode 76 = Up R8 KP_8
-keycode 77 = R9 R9 KP_9 Prior
-keycode 78 = KP_Subtract
-keycode 79 = L7 L7 SunOpen
-keycode 80 = L8 L8 SunPaste
-keycode 81 =
-keycode 82 =
-keycode 83 = Caps_Lock
-keycode 84 = A
-keycode 85 = S
-keycode 86 = D
-keycode 87 = F
-keycode 88 = G
-keycode 89 = H
-keycode 90 = J
-keycode 91 = K
-keycode 92 = L
-keycode 93 = Odiaeresis
-keycode 94 = Adiaeresis
-keycode 95 = bracketleft braceleft guillemotleft
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = Left R10 KP_4
-keycode 99 = R11 R11 KP_5
-keycode 100 = Right R12 KP_6
-keycode 101 = KP_Insert KP_Insert KP_0
-keycode 102 = L9 L9 SunFind
-keycode 103 =
-keycode 104 = L10 L10 SunCut
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = Y
-keycode 108 = X
-keycode 109 = C
-keycode 110 = V
-keycode 111 = B
-keycode 112 = N
-keycode 113 = M NoSymbol mu
-keycode 114 = comma semicolon
-keycode 115 = period colon
-keycode 116 = minus underscore
-keycode 117 = Shift_R
-keycode 118 = Linefeed
-keycode 119 = R13 R13 KP_1 End
-keycode 120 = Down R14 KP_2
-keycode 121 = R15 R15 KP_3 Next
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Control_L
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 =
-keycode 131 = less greater
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.de-usb b/gkb-new/xmodmap.sun/xmodmap.de-usb
deleted file mode 100644
index 1aa6089c..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.de-usb
+++ /dev/null
@@ -1,247 +0,0 @@
-keycode 8 =
-keycode 9 =
-keycode 10 =
-keycode 11 = A
-keycode 12 = B
-keycode 13 = C
-keycode 14 = D
-keycode 15 = e E currency
-keycode 16 = F
-keycode 17 = G
-keycode 18 = H
-keycode 19 = I
-keycode 20 = J
-keycode 21 = K
-keycode 22 = L
-keycode 23 = m M mu
-keycode 24 = N
-keycode 25 = O
-keycode 26 = P
-keycode 27 = q Q at
-keycode 28 = R
-keycode 29 = S
-keycode 30 = T
-keycode 31 = U
-keycode 32 = V
-keycode 33 = W
-keycode 34 = X
-keycode 35 = Z
-keycode 36 = Y
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl twosuperior
-keycode 39 = 3 section threesuperior
-keycode 40 = 4 dollar
-keycode 41 = 5 percent
-keycode 42 = 6 ampersand
-keycode 43 = 7 slash braceleft
-keycode 44 = 8 parenleft bracketleft
-keycode 45 = 9 parenright bracketright
-keycode 46 = 0 equal braceright
-keycode 47 = Return
-keycode 48 = Escape
-keycode 49 = BackSpace
-keycode 50 = Tab
-keycode 51 = space
-keycode 52 = ssharp question backslash
-keycode 53 = SunFA_Acute SunFA_Grave
-keycode 54 = Udiaeresis
-keycode 55 = plus asterisk asciitilde
-keycode 56 =
-keycode 57 = numbersign quoteright quoteleft
-keycode 58 = Odiaeresis
-keycode 59 = Adiaeresis
-keycode 60 = asciicircum degree
-keycode 61 = comma semicolon
-keycode 62 = period colon
-keycode 63 = minus underscore
-keycode 64 = Caps_Lock
-keycode 65 = F1
-keycode 66 = F2
-keycode 67 = F3
-keycode 68 = F4
-keycode 69 = F5
-keycode 70 = F6
-keycode 71 = F7
-keycode 72 = F8
-keycode 73 = F9
-keycode 74 = F10
-keycode 75 = SunF36
-keycode 76 = SunF37
-keycode 77 = R2 R2 Print SunSys_Req
-keycode 78 = R3 R3 Scroll_Lock
-keycode 79 = R1 R1 Pause Break
-keycode 80 = Insert
-keycode 81 = Home
-keycode 82 = Prior
-keycode 83 = Delete
-keycode 84 = End
-keycode 85 = Next
-keycode 86 = Right
-keycode 87 = Left
-keycode 88 = Down
-keycode 89 = Up
-keycode 90 = Num_Lock
-keycode 91 = R5 R5 KP_Divide
-keycode 92 = R6 R6 KP_Multiply
-keycode 93 = R4 R4 KP_Subtract
-keycode 94 = KP_Add
-keycode 95 = KP_Enter
-keycode 96 = R13 R13 KP_1 End
-keycode 97 = Down R14 KP_2
-keycode 98 = R15 R15 KP_3 Next
-keycode 99 = Left R10 KP_4
-keycode 100 = R11 R11 KP_5
-keycode 101 = Right R12 KP_6
-keycode 102 = R7 R7 KP_7 Home
-keycode 103 = Up R8 KP_8
-keycode 104 = R9 R9 KP_9 Prior
-keycode 105 = KP_Insert KP_Insert KP_0
-keycode 106 = Delete Delete KP_Separator
-keycode 107 = less greater bar
-keycode 108 = SunCompose
-keycode 109 = SunPowerSwitch SunPowerSwitchShift
-keycode 110 =
-keycode 111 =
-keycode 112 =
-keycode 113 =
-keycode 114 =
-keycode 115 =
-keycode 116 =
-keycode 117 =
-keycode 118 =
-keycode 119 =
-keycode 120 =
-keycode 121 =
-keycode 122 =
-keycode 123 = L7 L7 SunOpen
-keycode 124 = Help
-keycode 125 = L3 L3 SunProps
-keycode 126 = L5 L5 SunFront
-keycode 127 = L1 L1 SunStop
-keycode 128 = L2 L2 SunAgain
-keycode 129 = L4 L4 SunUndo
-keycode 130 = L10 L10 SunCut
-keycode 131 = L6 L6 SunCopy
-keycode 132 = L8 L8 SunPaste
-keycode 133 = L9 L9 SunFind
-keycode 134 = SunAudioMute SunVideoDegauss
-keycode 135 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 136 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 137 =
-keycode 138 =
-keycode 139 =
-keycode 140 =
-keycode 141 =
-keycode 142 =
-keycode 143 =
-keycode 144 =
-keycode 145 =
-keycode 146 =
-keycode 147 =
-keycode 148 =
-keycode 149 =
-keycode 150 =
-keycode 151 =
-keycode 152 =
-keycode 153 =
-keycode 154 =
-keycode 155 =
-keycode 156 =
-keycode 157 =
-keycode 158 =
-keycode 159 =
-keycode 160 =
-keycode 161 =
-keycode 162 =
-keycode 163 =
-keycode 164 =
-keycode 165 =
-keycode 166 =
-keycode 167 =
-keycode 168 =
-keycode 169 =
-keycode 170 =
-keycode 171 =
-keycode 172 =
-keycode 173 =
-keycode 174 =
-keycode 175 =
-keycode 176 =
-keycode 177 =
-keycode 178 =
-keycode 179 =
-keycode 180 =
-keycode 181 =
-keycode 182 =
-keycode 183 =
-keycode 184 =
-keycode 185 =
-keycode 186 =
-keycode 187 =
-keycode 188 =
-keycode 189 =
-keycode 190 =
-keycode 191 =
-keycode 192 =
-keycode 193 =
-keycode 194 =
-keycode 195 =
-keycode 196 =
-keycode 197 =
-keycode 198 =
-keycode 199 =
-keycode 200 =
-keycode 201 =
-keycode 202 =
-keycode 203 =
-keycode 204 =
-keycode 205 =
-keycode 206 =
-keycode 207 =
-keycode 208 =
-keycode 209 =
-keycode 210 =
-keycode 211 =
-keycode 212 =
-keycode 213 =
-keycode 214 =
-keycode 215 =
-keycode 216 =
-keycode 217 =
-keycode 218 =
-keycode 219 =
-keycode 220 =
-keycode 221 =
-keycode 222 =
-keycode 223 =
-keycode 224 =
-keycode 225 =
-keycode 226 =
-keycode 227 =
-keycode 228 =
-keycode 229 =
-keycode 230 =
-keycode 231 = Control_L
-keycode 232 = Shift_L
-keycode 233 = Alt_L
-keycode 234 = Meta_L
-keycode 235 =
-keycode 236 = Shift_R
-keycode 237 = SunAltGraph
-keycode 238 = Meta_R
-keycode 239 =
-keycode 240 =
-keycode 241 =
-keycode 242 =
-keycode 243 =
-keycode 244 =
-keycode 245 =
-keycode 246 =
-keycode 247 =
-keycode 248 =
-keycode 249 =
-keycode 250 =
-keycode 251 =
-keycode 252 =
-keycode 253 =
-keycode 254 =
diff --git a/gkb-new/xmodmap.sun/xmodmap.de_CH b/gkb-new/xmodmap.sun/xmodmap.de_CH
deleted file mode 100644
index 72908bd2..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.de_CH
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 plus bar exclamdown
-keycode 38 = 2 quotedbl at oneeighth
-keycode 39 = 3 asterisk numbersign
-keycode 40 = 4 ccedilla
-keycode 41 = 5 percent
-keycode 42 = 6 ampersand notsign
-keycode 43 = 7 slash brokenbar
-keycode 44 = 8 parenleft cent
-keycode 45 = 9 parenright
-keycode 46 = 0 equal
-keycode 47 = apostrophe question dead_acute
-keycode 48 = dead_circumflex dead_grave dead_tilde
-keycode 49 = section degree acute
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = w W
-keycode 63 = e E EuroSign
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = z Z
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = udiaeresis egrave bracketleft
-keycode 72 = dead_diaeresis exclam bracketright
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = odiaeresis eacute
-keycode 94 = adiaeresis agrave braceleft
-keycode 95 = dollar sterling braceright
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = y Y
-keycode 108 = x X
-keycode 109 = c C
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M
-keycode 114 = comma semicolon
-keycode 115 = period colon
-keycode 116 = minus underscore
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.dk b/gkb-new/xmodmap.sun/xmodmap.dk
deleted file mode 100644
index 802df960..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.dk
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam exclamdown onesuperior
-keycode 38 = 2 quotedbl at twosuperior
-keycode 39 = 3 numbersign sterling threesuperior
-keycode 40 = 4 currency dollar onequarter
-keycode 41 = 5 percent NoSymbol cent
-keycode 42 = 6 ampersand yen
-keycode 43 = 7 slash braceleft division
-keycode 44 = 8 parenleft bracketleft guillemotleft
-keycode 45 = 9 parenright bracketright guillemotright
-keycode 46 = 0 equal braceright degree
-keycode 47 = plus question plusminus questiondown
-keycode 48 = dead_acute dead_grave bar brokenbar
-keycode 49 = onehalf section threequarters paragraph
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = w W
-keycode 63 = e E EuroSign cent
-keycode 64 = r R registered
-keycode 65 = t T thorn THORN
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O oe OE
-keycode 70 = p P
-keycode 71 = aring Aring
-keycode 72 = dead_diaeresis dead_circumflex dead_tilde dead_caron
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A ordfeminine masculine
-keycode 85 = s S
-keycode 86 = d D eth ETH
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = ae AE
-keycode 94 = oslash Ooblique acute
-keycode 95 = apostrophe asterisk dead_doubleacute multiply
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z
-keycode 108 = x X
-keycode 109 = c C copyright
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M
-keycode 114 = comma semicolon dead_cedilla dead_ogonek
-keycode 115 = period colon periodcentered dead_abovedot
-keycode 116 = minus underscore hyphen macron
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space space nobreakspace nobreakspace
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.dk-type4 b/gkb-new/xmodmap.sun/xmodmap.dk-type4
deleted file mode 100644
index c5f96b16..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.dk-type4
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = L1 L1 SunStop
-keycode 9 =
-keycode 10 = L2 L2 SunAgain
-keycode 11 =
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = SunF36
-keycode 17 = F4
-keycode 18 = SunF37
-keycode 19 = F5
-keycode 20 = SunCompose
-keycode 21 = F6
-keycode 22 = asciitilde asciicircum
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 =
-keycode 28 = R1 R1 Pause
-keycode 29 = R2 R2 Print
-keycode 30 = R3 R3 Scroll_Lock Break
-keycode 31 =
-keycode 32 = L3 L3 SunProps
-keycode 33 = L4 L4 SunUndo
-keycode 34 =
-keycode 35 =
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl at
-keycode 39 = 3 numbersign sterling
-keycode 40 = 4 currency dollar
-keycode 41 = 5 percent
-keycode 42 = 6 ampersand
-keycode 43 = 7 slash braceleft
-keycode 44 = 8 parenleft bracketleft
-keycode 45 = 9 parenright bracketright
-keycode 46 = 0 equal braceright
-keycode 47 = plus question
-keycode 48 = SunFA_Acute SunFA_Grave bar
-keycode 49 = quoteright asterisk quoteleft
-keycode 50 = BackSpace
-keycode 51 =
-keycode 52 = R4 R4 KP_Equal
-keycode 53 = R5 R5 KP_Divide
-keycode 54 = R6 R6 KP_Multiply
-keycode 55 =
-keycode 56 = L5 L5 SunFront
-keycode 57 = Delete Delete KP_Decimal
-keycode 58 = L6 L6 SunCopy
-keycode 59 =
-keycode 60 = Tab
-keycode 61 = Q
-keycode 62 = W
-keycode 63 = e E currency
-keycode 64 = R
-keycode 65 = T
-keycode 66 = Y
-keycode 67 = U
-keycode 68 = I
-keycode 69 = O
-keycode 70 = P
-keycode 71 = Aring
-keycode 72 = SunFA_Diaeresis SunFA_Circum SunFA_Tilde
-keycode 73 = Delete
-keycode 74 = SunAltGraph
-keycode 75 = R7 R7 KP_7 Home
-keycode 76 = Up R8 KP_8
-keycode 77 = R9 R9 KP_9 Prior
-keycode 78 = KP_Subtract
-keycode 79 = L7 L7 SunOpen
-keycode 80 = L8 L8 SunPaste
-keycode 81 =
-keycode 82 =
-keycode 83 = Caps_Lock
-keycode 84 = A
-keycode 85 = S
-keycode 86 = D
-keycode 87 = F
-keycode 88 = G
-keycode 89 = H
-keycode 90 = J
-keycode 91 = K
-keycode 92 = L
-keycode 93 = AE
-keycode 94 = Ooblique
-keycode 95 = onehalf section
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = Left R10 KP_4
-keycode 99 = R11 R11 KP_5
-keycode 100 = Right R12 KP_6
-keycode 101 = KP_Insert KP_Insert KP_0
-keycode 102 = L9 L9 SunFind
-keycode 103 =
-keycode 104 = L10 L10 SunCut
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = Z
-keycode 108 = X
-keycode 109 = C
-keycode 110 = V
-keycode 111 = B
-keycode 112 = N
-keycode 113 = M
-keycode 114 = comma semicolon
-keycode 115 = period colon
-keycode 116 = minus underscore
-keycode 117 = Shift_R
-keycode 118 = Linefeed
-keycode 119 = R13 R13 KP_1 End
-keycode 120 = Down R14 KP_2
-keycode 121 = R15 R15 KP_3 Next
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Control_L
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 =
-keycode 131 = less greater backslash
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.dk-usb b/gkb-new/xmodmap.sun/xmodmap.dk-usb
deleted file mode 100644
index f0b9d4e6..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.dk-usb
+++ /dev/null
@@ -1,247 +0,0 @@
-keycode 8 =
-keycode 9 =
-keycode 10 =
-keycode 11 = A
-keycode 12 = B
-keycode 13 = C
-keycode 14 = D
-keycode 15 = e E currency
-keycode 16 = F
-keycode 17 = G
-keycode 18 = H
-keycode 19 = I
-keycode 20 = J
-keycode 21 = K
-keycode 22 = L
-keycode 23 = M
-keycode 24 = N
-keycode 25 = O
-keycode 26 = P
-keycode 27 = Q
-keycode 28 = R
-keycode 29 = S
-keycode 30 = T
-keycode 31 = U
-keycode 32 = V
-keycode 33 = W
-keycode 34 =
-keycode 35 = Y
-keycode 36 = Z
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl at
-keycode 39 = 3 numbersign sterling
-keycode 40 = 4 currency dollar
-keycode 41 = 5 percent asciitilde
-keycode 42 = 6 ampersand asciicircum
-keycode 43 = 7 slash braceleft
-keycode 44 = 8 parenleft bracketleft
-keycode 45 = 9 parenright bracketright
-keycode 46 = 0 equal braceright
-keycode 47 = Return
-keycode 48 = Escape
-keycode 49 = BackSpace
-keycode 50 = Tab
-keycode 51 = space
-keycode 52 = plus question
-keycode 53 = SunFA_Acute SunFA_Grave bar
-keycode 54 = Aring
-keycode 55 = SunFA_Diaeresis SunFA_Circum SunFA_Tilde
-keycode 56 =
-keycode 57 = quoteright asterisk quoteleft
-keycode 58 = AE
-keycode 59 = Ooblique
-keycode 60 = onehalf section
-keycode 61 = comma semicolon
-keycode 62 = period colon
-keycode 63 = minus underscore
-keycode 64 = Caps_Lock
-keycode 65 = F1
-keycode 66 = F2
-keycode 67 = F3
-keycode 68 = F4
-keycode 69 = F5
-keycode 70 = F6
-keycode 71 = F7
-keycode 72 = F8
-keycode 73 = F9
-keycode 74 = F10
-keycode 75 = SunF36
-keycode 76 = SunF37
-keycode 77 = R2 R2 Print SunSys_Req
-keycode 78 = R3 R3 Scroll_Lock
-keycode 79 = R1 R1 Pause Break
-keycode 80 = Insert
-keycode 81 = Home
-keycode 82 = Prior
-keycode 83 = Delete
-keycode 84 = End
-keycode 85 = Next
-keycode 86 = Right
-keycode 87 = Left
-keycode 88 = Down
-keycode 89 = Up
-keycode 90 = Num_Lock
-keycode 91 = R5 R5 KP_Divide
-keycode 92 = R6 R6 KP_Multiply
-keycode 93 = R4 R4 KP_Subtract
-keycode 94 = KP_Add
-keycode 95 = KP_Enter
-keycode 96 = R13 R13 KP_1 End
-keycode 97 = Down R14 KP_2
-keycode 98 = R15 R15 KP_3 Next
-keycode 99 = Left R10 KP_4
-keycode 100 = R11 R11 KP_5
-keycode 101 = Right R12 KP_6
-keycode 102 = R7 R7 KP_7 Home
-keycode 103 = Up R8 KP_8
-keycode 104 = R9 R9 KP_9 Prior
-keycode 105 = KP_Insert KP_Insert KP_0
-keycode 106 = Delete Delete KP_Separator
-keycode 107 = less greater backslash
-keycode 108 = SunCompose
-keycode 109 = SunPowerSwitch SunPowerSwitchShift
-keycode 110 =
-keycode 111 =
-keycode 112 =
-keycode 113 =
-keycode 114 =
-keycode 115 =
-keycode 116 =
-keycode 117 =
-keycode 118 =
-keycode 119 =
-keycode 120 =
-keycode 121 =
-keycode 122 =
-keycode 123 = L7 L7 SunOpen
-keycode 124 = Help
-keycode 125 = L3 L3 SunProps
-keycode 126 = L5 L5 SunFront
-keycode 127 = L1 L1 SunStop
-keycode 128 = L2 L2 SunAgain
-keycode 129 = L4 L4 SunUndo
-keycode 130 = L10 L10 SunCut
-keycode 131 = L6 L6 SunCopy
-keycode 132 = L8 L8 SunPaste
-keycode 133 = L9 L9 SunFind
-keycode 134 = SunAudioMute SunVideoDegauss
-keycode 135 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 136 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 137 =
-keycode 138 =
-keycode 139 =
-keycode 140 =
-keycode 141 =
-keycode 142 =
-keycode 143 =
-keycode 144 =
-keycode 145 =
-keycode 146 =
-keycode 147 =
-keycode 148 =
-keycode 149 =
-keycode 150 =
-keycode 151 =
-keycode 152 =
-keycode 153 =
-keycode 154 =
-keycode 155 =
-keycode 156 =
-keycode 157 =
-keycode 158 =
-keycode 159 =
-keycode 160 =
-keycode 161 =
-keycode 162 =
-keycode 163 =
-keycode 164 =
-keycode 165 =
-keycode 166 =
-keycode 167 =
-keycode 168 =
-keycode 169 =
-keycode 170 =
-keycode 171 =
-keycode 172 =
-keycode 173 =
-keycode 174 =
-keycode 175 =
-keycode 176 =
-keycode 177 =
-keycode 178 =
-keycode 179 =
-keycode 180 =
-keycode 181 =
-keycode 182 =
-keycode 183 =
-keycode 184 =
-keycode 185 =
-keycode 186 =
-keycode 187 =
-keycode 188 =
-keycode 189 =
-keycode 190 =
-keycode 191 =
-keycode 192 =
-keycode 193 =
-keycode 194 =
-keycode 195 =
-keycode 196 =
-keycode 197 =
-keycode 198 =
-keycode 199 =
-keycode 200 =
-keycode 201 =
-keycode 202 =
-keycode 203 =
-keycode 204 =
-keycode 205 =
-keycode 206 =
-keycode 207 =
-keycode 208 =
-keycode 209 =
-keycode 210 =
-keycode 211 =
-keycode 212 =
-keycode 213 =
-keycode 214 =
-keycode 215 =
-keycode 216 =
-keycode 217 =
-keycode 218 =
-keycode 219 =
-keycode 220 =
-keycode 221 =
-keycode 222 =
-keycode 223 =
-keycode 224 =
-keycode 225 =
-keycode 226 =
-keycode 227 =
-keycode 228 =
-keycode 229 =
-keycode 230 =
-keycode 231 = Control_L
-keycode 232 = Shift_L
-keycode 233 = Alt_L
-keycode 234 = Meta_L
-keycode 235 =
-keycode 236 = Shift_R
-keycode 237 = SunAltGraph
-keycode 238 = Meta_R
-keycode 239 =
-keycode 240 =
-keycode 241 =
-keycode 242 =
-keycode 243 =
-keycode 244 =
-keycode 245 =
-keycode 246 =
-keycode 247 =
-keycode 248 =
-keycode 249 =
-keycode 250 =
-keycode 251 =
-keycode 252 =
-keycode 253 =
-keycode 254 =
diff --git a/gkb-new/xmodmap.sun/xmodmap.ee b/gkb-new/xmodmap.sun/xmodmap.ee
deleted file mode 100644
index 9f1addaf..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.ee
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl at
-keycode 39 = 3 numbersign sterling
-keycode 40 = 4 currency dollar
-keycode 41 = 5 percent
-keycode 42 = 6 ampersand
-keycode 43 = 7 slash braceleft
-keycode 44 = 8 parenleft bracketleft
-keycode 45 = 9 parenright bracketright
-keycode 46 = 0 equal braceright
-keycode 47 = plus question backslash
-keycode 48 = dead_acute dead_grave grave apostrophe
-keycode 49 = dead_caron dead_tilde acute
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = w W
-keycode 63 = e E
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = udiaeresis Udiaeresis
-keycode 72 = otilde Otilde section
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S scaron Scaron
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = odiaeresis Odiaeresis
-keycode 94 = adiaeresis Adiaeresis asciicircum
-keycode 95 = apostrophe asterisk onehalf
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z zcaron Zcaron
-keycode 108 = x X
-keycode 109 = c C
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M
-keycode 114 = comma semicolon less
-keycode 115 = period colon greater
-keycode 116 = minus underscore
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.es b/gkb-new/xmodmap.sun/xmodmap.es
deleted file mode 100644
index 44835a0c..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.es
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam bar exclamdown
-keycode 38 = 2 quotedbl at oneeighth
-keycode 39 = 3 periodcentered numbersign sterling
-keycode 40 = 4 dollar asciitilde dollar
-keycode 41 = 5 percent
-keycode 42 = 6 ampersand notsign fiveeighths
-keycode 43 = 7 slash
-keycode 44 = 8 parenleft
-keycode 45 = 9 parenright
-keycode 46 = 0 equal
-keycode 47 = apostrophe question
-keycode 48 = exclamdown questiondown asciitilde asciitilde
-keycode 49 = masculine ordfeminine backslash backslash
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = w W
-keycode 63 = e E EuroSign cent
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = dead_grave dead_circumflex bracketleft dead_abovering
-keycode 72 = plus asterisk bracketright dead_macron
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = ntilde Ntilde asciitilde dead_doubleacute
-keycode 94 = dead_acute dead_diaeresis braceleft braceleft
-keycode 95 = ccedilla Ccedilla braceright dead_breve
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z
-keycode 108 = x X
-keycode 109 = c C
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M
-keycode 114 = comma semicolon
-keycode 115 = period colon
-keycode 116 = minus underscore
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.es-type4 b/gkb-new/xmodmap.sun/xmodmap.es-type4
deleted file mode 100644
index 07088b52..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.es-type4
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = L1 L1 SunStop
-keycode 9 =
-keycode 10 = L2 L2 SunAgain
-keycode 11 =
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = SunF36
-keycode 17 = F4
-keycode 18 = SunF37
-keycode 19 = F5
-keycode 20 = SunAltGraph
-keycode 21 = F6
-keycode 22 = bracketright braceright guillemotright
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 =
-keycode 28 = R1 R1 Pause
-keycode 29 = R2 R2 Print
-keycode 30 = R3 R3 Scroll_Lock Break
-keycode 31 =
-keycode 32 = L3 L3 SunProps
-keycode 33 = L4 L4 SunUndo
-keycode 34 =
-keycode 35 =
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl at
-keycode 39 = 3 periodcentered numbersign
-keycode 40 = 4 dollar
-keycode 41 = 5 percent degree
-keycode 42 = 6 ampersand notsign
-keycode 43 = 7 slash
-keycode 44 = 8 parenleft
-keycode 45 = 9 parenright backslash
-keycode 46 = 0 equal bar
-keycode 47 = quoteright question quoteleft
-keycode 48 = exclamdown questiondown
-keycode 49 = Ccedilla
-keycode 50 = BackSpace
-keycode 51 =
-keycode 52 = R4 R4 KP_Equal
-keycode 53 = R5 R5 KP_Divide
-keycode 54 = R6 R6 KP_Multiply
-keycode 55 =
-keycode 56 = L5 L5 SunFront
-keycode 57 = Delete Delete KP_Decimal
-keycode 58 = L6 L6 SunCopy
-keycode 59 =
-keycode 60 = Tab
-keycode 61 = Q
-keycode 62 = W
-keycode 63 = e E currency
-keycode 64 = R
-keycode 65 = T
-keycode 66 = Y
-keycode 67 = U
-keycode 68 = I
-keycode 69 = O NoSymbol masculine
-keycode 70 = P
-keycode 71 = SunFA_Grave SunFA_Circum asciicircum
-keycode 72 = plus asterisk asciitilde
-keycode 73 = Delete
-keycode 74 = SunCompose
-keycode 75 = R7 R7 KP_7 Home
-keycode 76 = Up R8 KP_8
-keycode 77 = R9 R9 KP_9 Prior
-keycode 78 = KP_Subtract
-keycode 79 = L7 L7 SunOpen
-keycode 80 = L8 L8 SunPaste
-keycode 81 =
-keycode 82 =
-keycode 83 = Caps_Lock
-keycode 84 = A
-keycode 85 = S
-keycode 86 = D
-keycode 87 = F
-keycode 88 = G
-keycode 89 = H
-keycode 90 = J
-keycode 91 = K
-keycode 92 = L
-keycode 93 = Ntilde
-keycode 94 = SunFA_Acute SunFA_Diaeresis
-keycode 95 = bracketleft braceleft guillemotleft
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = Left R10 KP_4
-keycode 99 = R11 R11 KP_5
-keycode 100 = Right R12 KP_6
-keycode 101 = KP_Insert KP_Insert KP_0
-keycode 102 = L9 L9 SunFind
-keycode 103 =
-keycode 104 = L10 L10 SunCut
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = Z
-keycode 108 = X
-keycode 109 = C
-keycode 110 = V
-keycode 111 = B
-keycode 112 = N
-keycode 113 = M
-keycode 114 = comma semicolon
-keycode 115 = period colon
-keycode 116 = minus underscore
-keycode 117 = Shift_R
-keycode 118 = Linefeed
-keycode 119 = R13 R13 KP_1 End
-keycode 120 = Down R14 KP_2
-keycode 121 = R15 R15 KP_3 Next
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Control_L
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 =
-keycode 131 = less greater
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.es-usb b/gkb-new/xmodmap.sun/xmodmap.es-usb
deleted file mode 100644
index 0be09a6f..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.es-usb
+++ /dev/null
@@ -1,247 +0,0 @@
-keycode 8 =
-keycode 9 =
-keycode 10 =
-keycode 11 = A
-keycode 12 = B
-keycode 13 = C
-keycode 14 = D
-keycode 15 = e E currency
-keycode 16 = F
-keycode 17 = G
-keycode 18 = H
-keycode 19 = I
-keycode 20 = J
-keycode 21 = K
-keycode 22 = L
-keycode 23 = M
-keycode 24 = N
-keycode 25 = O
-keycode 26 = P
-keycode 27 = Q
-keycode 28 = R
-keycode 29 = S
-keycode 30 = T
-keycode 31 = U
-keycode 32 = V
-keycode 33 = W
-keycode 34 = X
-keycode 35 = Y
-keycode 36 = Z
-keycode 37 = 1 exclam bar
-keycode 38 = 2 quotedbl at
-keycode 39 = 3 periodcentered numbersign
-keycode 40 = 4 dollar asciicircum
-keycode 41 = 5 percent asciitilde
-keycode 42 = 6 ampersand notsign
-keycode 43 = 7 slash
-keycode 44 = 8 parenleft
-keycode 45 = 9 parenright
-keycode 46 = 0 equal
-keycode 47 = Return
-keycode 48 = Escape
-keycode 49 = BackSpace
-keycode 50 = Tab
-keycode 51 = space
-keycode 52 = quoteright question quoteleft
-keycode 53 = exclamdown questiondown
-keycode 54 = SunFA_Grave SunFA_Circum bracketleft
-keycode 55 = plus asterisk bracketright
-keycode 56 =
-keycode 57 = ccedilla Ccedilla braceright
-keycode 58 = Ntilde
-keycode 59 = SunFA_Acute SunFA_Diaeresis braceleft
-keycode 60 = masculine ordfeminine backslash
-keycode 61 = comma semicolon
-keycode 62 = period colon
-keycode 63 = minus underscore
-keycode 64 = Caps_Lock
-keycode 65 = F1
-keycode 66 = F2
-keycode 67 = F3
-keycode 68 = F4
-keycode 69 = F5
-keycode 70 = F6
-keycode 71 = F7
-keycode 72 = F8
-keycode 73 = F9
-keycode 74 = F10
-keycode 75 = SunF36
-keycode 76 = SunF37
-keycode 77 = R2 R2 Print SunSys_Req
-keycode 78 = R3 R3 Scroll_Lock
-keycode 79 = R1 R1 Pause Break
-keycode 80 = Insert
-keycode 81 = Home
-keycode 82 = Prior
-keycode 83 = Delete
-keycode 84 = End
-keycode 85 = Next
-keycode 86 = Right
-keycode 87 = Left
-keycode 88 = Down
-keycode 89 = Up
-keycode 90 = Num_Lock
-keycode 91 = R5 R5 KP_Divide
-keycode 92 = R6 R6 KP_Multiply
-keycode 93 = R4 R4 KP_Subtract
-keycode 94 = KP_Add
-keycode 95 = KP_Enter
-keycode 96 = R13 R13 KP_1 End
-keycode 97 = Down R14 KP_2
-keycode 98 = R15 R15 KP_3 Next
-keycode 99 = Left R10 KP_4
-keycode 100 = R11 R11 KP_5
-keycode 101 = Right R12 KP_6
-keycode 102 = R7 R7 KP_7 Home
-keycode 103 = Up R8 KP_8
-keycode 104 = R9 R9 KP_9 Prior
-keycode 105 = KP_Insert KP_Insert KP_0
-keycode 106 = Delete Delete KP_Decimal
-keycode 107 = less greater
-keycode 108 = SunCompose
-keycode 109 = SunPowerSwitch SunPowerSwitchShift
-keycode 110 =
-keycode 111 =
-keycode 112 =
-keycode 113 =
-keycode 114 =
-keycode 115 =
-keycode 116 =
-keycode 117 =
-keycode 118 =
-keycode 119 =
-keycode 120 =
-keycode 121 =
-keycode 122 =
-keycode 123 = L7 L7 SunOpen
-keycode 124 = Help
-keycode 125 = L3 L3 SunProps
-keycode 126 = L5 L5 SunFront
-keycode 127 = L1 L1 SunStop
-keycode 128 = L2 L2 SunAgain
-keycode 129 = L4 L4 SunUndo
-keycode 130 = L10 L10 SunCut
-keycode 131 = L6 L6 SunCopy
-keycode 132 = L8 L8 SunPaste
-keycode 133 = L9 L9 SunFind
-keycode 134 = SunAudioMute SunVideoDegauss
-keycode 135 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 136 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 137 =
-keycode 138 =
-keycode 139 =
-keycode 140 =
-keycode 141 =
-keycode 142 =
-keycode 143 =
-keycode 144 =
-keycode 145 =
-keycode 146 =
-keycode 147 =
-keycode 148 =
-keycode 149 =
-keycode 150 =
-keycode 151 =
-keycode 152 =
-keycode 153 =
-keycode 154 =
-keycode 155 =
-keycode 156 =
-keycode 157 =
-keycode 158 =
-keycode 159 =
-keycode 160 =
-keycode 161 =
-keycode 162 =
-keycode 163 =
-keycode 164 =
-keycode 165 =
-keycode 166 =
-keycode 167 =
-keycode 168 =
-keycode 169 =
-keycode 170 =
-keycode 171 =
-keycode 172 =
-keycode 173 =
-keycode 174 =
-keycode 175 =
-keycode 176 =
-keycode 177 =
-keycode 178 =
-keycode 179 =
-keycode 180 =
-keycode 181 =
-keycode 182 =
-keycode 183 =
-keycode 184 =
-keycode 185 =
-keycode 186 =
-keycode 187 =
-keycode 188 =
-keycode 189 =
-keycode 190 =
-keycode 191 =
-keycode 192 =
-keycode 193 =
-keycode 194 =
-keycode 195 =
-keycode 196 =
-keycode 197 =
-keycode 198 =
-keycode 199 =
-keycode 200 =
-keycode 201 =
-keycode 202 =
-keycode 203 =
-keycode 204 =
-keycode 205 =
-keycode 206 =
-keycode 207 =
-keycode 208 =
-keycode 209 =
-keycode 210 =
-keycode 211 =
-keycode 212 =
-keycode 213 =
-keycode 214 =
-keycode 215 =
-keycode 216 =
-keycode 217 =
-keycode 218 =
-keycode 219 =
-keycode 220 =
-keycode 221 =
-keycode 222 =
-keycode 223 =
-keycode 224 =
-keycode 225 =
-keycode 226 =
-keycode 227 =
-keycode 228 =
-keycode 229 =
-keycode 230 =
-keycode 231 = Control_L
-keycode 232 = Shift_L
-keycode 233 = Alt_L
-keycode 234 = Meta_L
-keycode 235 =
-keycode 236 = Shift_R
-keycode 237 = SunAltGraph
-keycode 238 = Meta_R
-keycode 239 =
-keycode 240 =
-keycode 241 =
-keycode 242 =
-keycode 243 =
-keycode 244 =
-keycode 245 =
-keycode 246 =
-keycode 247 =
-keycode 248 =
-keycode 249 =
-keycode 250 =
-keycode 251 =
-keycode 252 =
-keycode 253 =
-keycode 254 =
diff --git a/gkb-new/xmodmap.sun/xmodmap.fi b/gkb-new/xmodmap.sun/xmodmap.fi
deleted file mode 100644
index e4c7f31d..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.fi
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam exclamdown onesuperior
-keycode 38 = 2 quotedbl at twosuperior
-keycode 39 = 3 numbersign sterling threesuperior
-keycode 40 = 4 currency dollar onequarter
-keycode 41 = 5 percent NoSymbol cent
-keycode 42 = 6 ampersand yen
-keycode 43 = 7 slash braceleft division
-keycode 44 = 8 parenleft bracketleft guillemotleft
-keycode 45 = 9 parenright bracketright guillemotright
-keycode 46 = 0 equal braceright degree
-keycode 47 = plus question backslash questiondown
-keycode 48 = dead_acute dead_grave plusminus notsign
-keycode 49 = section onehalf paragraph threequarters
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = w W
-keycode 63 = e E EuroSign cent
-keycode 64 = r R registered
-keycode 65 = t T thorn THORN
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O oe OE
-keycode 70 = p P
-keycode 71 = aring Aring
-keycode 72 = dead_diaeresis dead_circumflex dead_tilde dead_caron
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A ordfeminine masculine
-keycode 85 = s S
-keycode 86 = d D eth ETH
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = odiaeresis Odiaeresis oslash Ooblique
-keycode 94 = adiaeresis Adiaeresis ae AE
-keycode 95 = apostrophe asterisk acute multiply
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z
-keycode 108 = x X
-keycode 109 = c C copyright
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M
-keycode 114 = comma semicolon dead_cedilla dead_ogonek
-keycode 115 = period colon periodcentered dead_abovedot
-keycode 116 = minus underscore hyphen macron
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space space nobreakspace nobreakspace
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.fr b/gkb-new/xmodmap.sun/xmodmap.fr
deleted file mode 100644
index e2cb35d3..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.fr
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = ampersand 1 onesuperior exclamdown
-keycode 38 = eacute 2 asciitilde oneeighth
-keycode 39 = quotedbl 3 numbersign sterling
-keycode 40 = apostrophe 4 braceleft dollar
-keycode 41 = parenleft 5 bracketleft threeeighths
-keycode 42 = minus 6 bar fiveeighths
-keycode 43 = egrave 7 grave seveneighths
-keycode 44 = underscore 8 backslash trademark
-keycode 45 = ccedilla 9 asciicircum plusminus
-keycode 46 = agrave 0 at degree
-keycode 47 = parenright degree bracketright questiondown
-keycode 48 = equal plus braceright dead_ogonek
-keycode 49 = twosuperior asciitilde acute
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = a A ae AE
-keycode 62 = z Z guillemotleft less
-keycode 63 = e E EuroSign cent
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = dead_circumflex dead_diaeresis
-keycode 72 = dollar sterling currency dead_macron
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = q Q at Greek_OMEGA
-keycode 85 = s S
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = m M mu masculine
-keycode 94 = ugrave percent acute
-keycode 95 = asterisk mu
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = w W lstroke Lstroke
-keycode 108 = x X
-keycode 109 = c C
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = comma question dead_acute dead_doubleacute
-keycode 114 = semicolon period
-keycode 115 = colon slash
-keycode 116 = exclam section
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.fr-usb b/gkb-new/xmodmap.sun/xmodmap.fr-usb
deleted file mode 100644
index 34d8aa65..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.fr-usb
+++ /dev/null
@@ -1,247 +0,0 @@
-keycode 8 =
-keycode 9 =
-keycode 10 =
-keycode 11 = Q
-keycode 12 = B
-keycode 13 = C
-keycode 14 = D
-keycode 15 = e E currency
-keycode 16 = F
-keycode 17 = G
-keycode 18 = H
-keycode 19 = I
-keycode 20 = J
-keycode 21 = K
-keycode 22 = L
-keycode 23 = comma question
-keycode 24 = N
-keycode 25 = O
-keycode 26 = P
-keycode 27 = A
-keycode 28 = R
-keycode 29 = S
-keycode 30 = T
-keycode 31 = U
-keycode 32 = V
-keycode 33 = Z
-keycode 34 = X
-keycode 35 = Y
-keycode 36 = W
-keycode 37 = ampersand 1
-keycode 38 = eacute 2 asciitilde
-keycode 39 = quotedbl 3 numbersign
-keycode 40 = quoteright 4 braceleft
-keycode 41 = parenleft 5 bracketleft
-keycode 42 = minus 6 bar
-keycode 43 = egrave 7 quoteleft
-keycode 44 = underscore 8 backslash
-keycode 45 = ccedilla 9 asciicircum
-keycode 46 = agrave 0 at
-keycode 47 = Return
-keycode 48 = Escape
-keycode 49 = BackSpace
-keycode 50 = Tab
-keycode 51 = space
-keycode 52 = parenright degree bracketright
-keycode 53 = equal plus braceright
-keycode 54 = SunFA_Circum SunFA_Diaeresis
-keycode 55 = dollar sterling currency
-keycode 56 =
-keycode 57 = asterisk mu
-keycode 58 = M
-keycode 59 = ugrave percent
-keycode 60 = twosuperior
-keycode 61 = semicolon period
-keycode 62 = colon slash
-keycode 63 = exclam section
-keycode 64 = Caps_Lock
-keycode 65 = F1
-keycode 66 = F2
-keycode 67 = F3
-keycode 68 = F4
-keycode 69 = F5
-keycode 70 = F6
-keycode 71 = F7
-keycode 72 = F8
-keycode 73 = F9
-keycode 74 = F10
-keycode 75 = SunF36
-keycode 76 = SunF37
-keycode 77 = R2 R2 Print SunSys_Req
-keycode 78 = R3 R3 Scroll_Lock
-keycode 79 = R1 R1 Pause Break
-keycode 80 = Insert
-keycode 81 = Home
-keycode 82 = Prior
-keycode 83 = Delete
-keycode 84 = End
-keycode 85 = Next
-keycode 86 = Right
-keycode 87 = Left
-keycode 88 = Down
-keycode 89 = Up
-keycode 90 = Num_Lock
-keycode 91 = R5 R5 KP_Divide
-keycode 92 = R6 R6 KP_Multiply
-keycode 93 = R4 R4 KP_Subtract
-keycode 94 = KP_Add
-keycode 95 = KP_Enter
-keycode 96 = R13 R13 KP_1 End
-keycode 97 = Down R14 KP_2
-keycode 98 = R15 R15 KP_3 Next
-keycode 99 = Left R10 KP_4
-keycode 100 = R11 R11 KP_5
-keycode 101 = Right R12 KP_6
-keycode 102 = R7 R7 KP_7 Home
-keycode 103 = Up R8 KP_8
-keycode 104 = R9 R9 KP_9 Prior
-keycode 105 = KP_Insert KP_Insert KP_0
-keycode 106 = Delete Delete KP_Decimal
-keycode 107 = less greater
-keycode 108 = SunCompose
-keycode 109 = SunPowerSwitch SunPowerSwitchShift
-keycode 110 =
-keycode 111 =
-keycode 112 =
-keycode 113 =
-keycode 114 =
-keycode 115 =
-keycode 116 =
-keycode 117 =
-keycode 118 =
-keycode 119 =
-keycode 120 =
-keycode 121 =
-keycode 122 =
-keycode 123 = L7 L7 SunOpen
-keycode 124 = Help
-keycode 125 = L3 L3 SunProps
-keycode 126 = L5 L5 SunFront
-keycode 127 = L1 L1 SunStop
-keycode 128 = L2 L2 SunAgain
-keycode 129 = L4 L4 SunUndo
-keycode 130 = L10 L10 SunCut
-keycode 131 = L6 L6 SunCopy
-keycode 132 = L8 L8 SunPaste
-keycode 133 = L9 L9 SunFind
-keycode 134 = SunAudioMute SunVideoDegauss
-keycode 135 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 136 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 137 =
-keycode 138 =
-keycode 139 =
-keycode 140 =
-keycode 141 =
-keycode 142 =
-keycode 143 =
-keycode 144 =
-keycode 145 =
-keycode 146 =
-keycode 147 =
-keycode 148 =
-keycode 149 =
-keycode 150 =
-keycode 151 =
-keycode 152 =
-keycode 153 =
-keycode 154 =
-keycode 155 =
-keycode 156 =
-keycode 157 =
-keycode 158 =
-keycode 159 =
-keycode 160 =
-keycode 161 =
-keycode 162 =
-keycode 163 =
-keycode 164 =
-keycode 165 =
-keycode 166 =
-keycode 167 =
-keycode 168 =
-keycode 169 =
-keycode 170 =
-keycode 171 =
-keycode 172 =
-keycode 173 =
-keycode 174 =
-keycode 175 =
-keycode 176 =
-keycode 177 =
-keycode 178 =
-keycode 179 =
-keycode 180 =
-keycode 181 =
-keycode 182 =
-keycode 183 =
-keycode 184 =
-keycode 185 =
-keycode 186 =
-keycode 187 =
-keycode 188 =
-keycode 189 =
-keycode 190 =
-keycode 191 =
-keycode 192 =
-keycode 193 =
-keycode 194 =
-keycode 195 =
-keycode 196 =
-keycode 197 =
-keycode 198 =
-keycode 199 =
-keycode 200 =
-keycode 201 =
-keycode 202 =
-keycode 203 =
-keycode 204 =
-keycode 205 =
-keycode 206 =
-keycode 207 =
-keycode 208 =
-keycode 209 =
-keycode 210 =
-keycode 211 =
-keycode 212 =
-keycode 213 =
-keycode 214 =
-keycode 215 =
-keycode 216 =
-keycode 217 =
-keycode 218 =
-keycode 219 =
-keycode 220 =
-keycode 221 =
-keycode 222 =
-keycode 223 =
-keycode 224 =
-keycode 225 =
-keycode 226 =
-keycode 227 =
-keycode 228 =
-keycode 229 =
-keycode 230 =
-keycode 231 = Control_L
-keycode 232 = Shift_L
-keycode 233 = Alt_L
-keycode 234 = Meta_L
-keycode 235 =
-keycode 236 = Shift_R
-keycode 237 = SunAltGraph
-keycode 238 = Meta_R
-keycode 239 =
-keycode 240 =
-keycode 241 =
-keycode 242 =
-keycode 243 =
-keycode 244 =
-keycode 245 =
-keycode 246 =
-keycode 247 =
-keycode 248 =
-keycode 249 =
-keycode 250 =
-keycode 251 =
-keycode 252 =
-keycode 253 =
-keycode 254 =
diff --git a/gkb-new/xmodmap.sun/xmodmap.gb b/gkb-new/xmodmap.sun/xmodmap.gb
deleted file mode 100644
index 48c868d6..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.gb
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl
-keycode 39 = 3 sterling
-keycode 40 = 4 dollar
-keycode 41 = 5 percent
-keycode 42 = 6 asciicircum
-keycode 43 = 7 ampersand
-keycode 44 = 8 asterisk
-keycode 45 = 9 parenleft
-keycode 46 = 0 parenright
-keycode 47 = minus underscore
-keycode 48 = equal plus
-keycode 49 = grave notsign bar bar
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = w W
-keycode 63 = e E
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = bracketleft braceleft
-keycode 72 = bracketright braceright
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = semicolon colon
-keycode 94 = apostrophe at acute
-keycode 95 = numbersign asciitilde
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z
-keycode 108 = x X
-keycode 109 = c C
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M
-keycode 114 = comma less
-keycode 115 = period greater
-keycode 116 = slash question
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.gb-type4 b/gkb-new/xmodmap.sun/xmodmap.gb-type4
deleted file mode 100644
index 0f43e9e5..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.gb-type4
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = L1 L1 SunStop
-keycode 9 =
-keycode 10 = L2 L2 SunAgain
-keycode 11 =
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = SunF36
-keycode 17 = F4
-keycode 18 = SunF37
-keycode 19 = F5
-keycode 20 = SunAltGraph
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 =
-keycode 28 = R1 R1 Pause
-keycode 29 = R2 R2 Print
-keycode 30 = R3 R3 Scroll_Lock Break
-keycode 31 =
-keycode 32 = L3 L3 SunProps
-keycode 33 = L4 L4 SunUndo
-keycode 34 =
-keycode 35 =
-keycode 36 = Escape
-keycode 37 = 1 exclam brokenbar
-keycode 38 = 2 at
-keycode 39 = 3 sterling numbersign
-keycode 40 = 4 dollar currency
-keycode 41 = 5 percent
-keycode 42 = 6 asciicircum
-keycode 43 = 7 ampersand
-keycode 44 = 8 asterisk
-keycode 45 = 9 parenleft
-keycode 46 = 0 parenright
-keycode 47 = minus underscore notsign
-keycode 48 = equal plus
-keycode 49 = quoteleft asciitilde
-keycode 50 = BackSpace
-keycode 51 =
-keycode 52 = R4 R4 KP_Equal
-keycode 53 = R5 R5 KP_Divide
-keycode 54 = R6 R6 KP_Multiply
-keycode 55 =
-keycode 56 = L5 L5 SunFront
-keycode 57 = Delete Delete KP_Decimal
-keycode 58 = L6 L6 SunCopy
-keycode 59 =
-keycode 60 = Tab
-keycode 61 = Q
-keycode 62 = W
-keycode 63 = e E currency
-keycode 64 = R
-keycode 65 = T
-keycode 66 = Y
-keycode 67 = U
-keycode 68 = I
-keycode 69 = O
-keycode 70 = P
-keycode 71 = bracketleft braceleft
-keycode 72 = bracketright braceright
-keycode 73 = Delete
-keycode 74 = SunCompose
-keycode 75 = R7 R7 KP_7 Home
-keycode 76 = Up R8 KP_8
-keycode 77 = R9 R9 KP_9 Prior
-keycode 78 = KP_Subtract
-keycode 79 = L7 L7 SunOpen
-keycode 80 = L8 L8 SunPaste
-keycode 81 =
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = A
-keycode 85 = S
-keycode 86 = D
-keycode 87 = F
-keycode 88 = G
-keycode 89 = H
-keycode 90 = J
-keycode 91 = K
-keycode 92 = L
-keycode 93 = semicolon colon
-keycode 94 = quoteright quotedbl
-keycode 95 = backslash bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = Left R10 KP_4
-keycode 99 = R11 R11 KP_5
-keycode 100 = Right R12 KP_6
-keycode 101 = KP_Insert KP_Insert KP_0
-keycode 102 = L9 L9 SunFind
-keycode 103 =
-keycode 104 = L10 L10 SunCut
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = Z
-keycode 108 = X
-keycode 109 = C
-keycode 110 = V
-keycode 111 = B
-keycode 112 = N
-keycode 113 = M
-keycode 114 = comma less
-keycode 115 = period greater
-keycode 116 = slash question
-keycode 117 = Shift_R
-keycode 118 = Linefeed
-keycode 119 = R13 R13 KP_1 End
-keycode 120 = Down R14 KP_2
-keycode 121 = R15 R15 KP_3 Next
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 =
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.gb-usb b/gkb-new/xmodmap.sun/xmodmap.gb-usb
deleted file mode 100644
index 2ad137ef..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.gb-usb
+++ /dev/null
@@ -1,247 +0,0 @@
-keycode 8 =
-keycode 9 =
-keycode 10 =
-keycode 11 = A
-keycode 12 = B
-keycode 13 = C
-keycode 14 = D
-keycode 15 = e E currency
-keycode 16 = F
-keycode 17 = G
-keycode 18 = H
-keycode 19 = I
-keycode 20 = J
-keycode 21 = K
-keycode 22 = L
-keycode 23 = M
-keycode 24 = N
-keycode 25 = O
-keycode 26 = P
-keycode 27 = Q
-keycode 28 = R
-keycode 29 = S
-keycode 30 = T
-keycode 31 = U
-keycode 32 = V
-keycode 33 = W
-keycode 34 = X
-keycode 35 = Y
-keycode 36 = Z
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl
-keycode 39 = 3 sterling
-keycode 40 = 4 dollar currency
-keycode 41 = 5 percent
-keycode 42 = 6 asciicircum
-keycode 43 = 7 ampersand
-keycode 44 = 8 asterisk
-keycode 45 = 9 parenleft
-keycode 46 = 0 parenright
-keycode 47 = Return
-keycode 48 = Escape
-keycode 49 = BackSpace
-keycode 50 = Tab
-keycode 51 = space
-keycode 52 = minus underscore
-keycode 53 = equal plus
-keycode 54 = bracketleft braceleft
-keycode 55 = bracketright braceright
-keycode 56 =
-keycode 57 = numbersign asciitilde
-keycode 58 = semicolon colon
-keycode 59 = quoteright at
-keycode 60 = quoteleft notsign brokenbar
-keycode 61 = comma less
-keycode 62 = period greater
-keycode 63 = slash question
-keycode 64 = Caps_Lock
-keycode 65 = F1
-keycode 66 = F2
-keycode 67 = F3
-keycode 68 = F4
-keycode 69 = F5
-keycode 70 = F6
-keycode 71 = F7
-keycode 72 = F8
-keycode 73 = F9
-keycode 74 = F10
-keycode 75 = SunF36
-keycode 76 = SunF37
-keycode 77 = R2 R2 Print SunSys_Req
-keycode 78 = R3 R3 Scroll_Lock
-keycode 79 = R1 R1 Pause Break
-keycode 80 = Insert
-keycode 81 = Home
-keycode 82 = Prior
-keycode 83 = Delete
-keycode 84 = End
-keycode 85 = Next
-keycode 86 = Right
-keycode 87 = Left
-keycode 88 = Down
-keycode 89 = Up
-keycode 90 = Num_Lock
-keycode 91 = R5 R5 KP_Divide
-keycode 92 = R6 R6 KP_Multiply
-keycode 93 = R4 R4 KP_Subtract
-keycode 94 = KP_Add
-keycode 95 = KP_Enter
-keycode 96 = R13 R13 KP_1 End
-keycode 97 = Down R14 KP_2
-keycode 98 = R15 R15 KP_3 Next
-keycode 99 = Left R10 KP_4
-keycode 100 = R11 R11 KP_5
-keycode 101 = Right R12 KP_6
-keycode 102 = R7 R7 KP_7 Home
-keycode 103 = Up R8 KP_8
-keycode 104 = R9 R9 KP_9 Prior
-keycode 105 = KP_Insert KP_Insert KP_0
-keycode 106 = Delete Delete KP_Decimal
-keycode 107 = backslash bar
-keycode 108 = SunCompose
-keycode 109 = SunPowerSwitch SunPowerSwitchShift
-keycode 110 =
-keycode 111 =
-keycode 112 =
-keycode 113 =
-keycode 114 =
-keycode 115 =
-keycode 116 =
-keycode 117 =
-keycode 118 = Help
-keycode 119 =
-keycode 120 =
-keycode 121 =
-keycode 122 =
-keycode 123 = L7 L7 SunOpen
-keycode 124 =
-keycode 125 = L3 L3 SunProps
-keycode 126 = L5 L5 SunFront
-keycode 127 = L1 L1 SunStop
-keycode 128 = L2 L2 SunAgain
-keycode 129 = L4 L4 SunUndo
-keycode 130 = L10 L10 SunCut
-keycode 131 = L6 L6 SunCopy
-keycode 132 = L8 L8 SunPaste
-keycode 133 = L9 L9 SunFind
-keycode 134 = SunAudioMute SunVideoDegauss
-keycode 135 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 136 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 137 =
-keycode 138 =
-keycode 139 =
-keycode 140 =
-keycode 141 =
-keycode 142 =
-keycode 143 =
-keycode 144 =
-keycode 145 =
-keycode 146 =
-keycode 147 =
-keycode 148 =
-keycode 149 =
-keycode 150 =
-keycode 151 =
-keycode 152 =
-keycode 153 =
-keycode 154 =
-keycode 155 =
-keycode 156 =
-keycode 157 =
-keycode 158 =
-keycode 159 =
-keycode 160 =
-keycode 161 =
-keycode 162 =
-keycode 163 =
-keycode 164 =
-keycode 165 =
-keycode 166 =
-keycode 167 =
-keycode 168 =
-keycode 169 =
-keycode 170 =
-keycode 171 =
-keycode 172 =
-keycode 173 =
-keycode 174 =
-keycode 175 =
-keycode 176 =
-keycode 177 =
-keycode 178 =
-keycode 179 =
-keycode 180 =
-keycode 181 =
-keycode 182 =
-keycode 183 =
-keycode 184 =
-keycode 185 =
-keycode 186 =
-keycode 187 =
-keycode 188 =
-keycode 189 =
-keycode 190 =
-keycode 191 =
-keycode 192 =
-keycode 193 =
-keycode 194 =
-keycode 195 =
-keycode 196 =
-keycode 197 =
-keycode 198 =
-keycode 199 =
-keycode 200 =
-keycode 201 =
-keycode 202 =
-keycode 203 =
-keycode 204 =
-keycode 205 =
-keycode 206 =
-keycode 207 =
-keycode 208 =
-keycode 209 =
-keycode 210 =
-keycode 211 =
-keycode 212 =
-keycode 213 =
-keycode 214 =
-keycode 215 =
-keycode 216 =
-keycode 217 =
-keycode 218 =
-keycode 219 =
-keycode 220 =
-keycode 221 =
-keycode 222 =
-keycode 223 =
-keycode 224 =
-keycode 225 =
-keycode 226 =
-keycode 227 =
-keycode 228 =
-keycode 229 =
-keycode 230 =
-keycode 231 = Control_L
-keycode 232 = Shift_L
-keycode 233 = Alt_L
-keycode 234 = Meta_L
-keycode 235 =
-keycode 236 = Shift_R
-keycode 237 = SunAltGraph
-keycode 238 = Meta_R
-keycode 239 =
-keycode 240 =
-keycode 241 =
-keycode 242 =
-keycode 243 =
-keycode 244 =
-keycode 245 =
-keycode 246 =
-keycode 247 =
-keycode 248 =
-keycode 249 =
-keycode 250 =
-keycode 251 =
-keycode 252 =
-keycode 253 =
-keycode 254 =
diff --git a/gkb-new/xmodmap.sun/xmodmap.hu b/gkb-new/xmodmap.sun/xmodmap.hu
deleted file mode 100644
index ca7e541e..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.hu
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch Multi_key
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L Meta_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 apostrophe asciitilde dead_tilde
-keycode 38 = 2 quotedbl dead_caron caron
-keycode 39 = 3 plus asciicircum dead_circumflex
-keycode 40 = 4 exclam dead_breve breve
-keycode 41 = 5 percent dead_abovering degree
-keycode 42 = 6 slash dead_ogonek ogonek
-keycode 43 = 7 equal grave dead_grave
-keycode 44 = 8 parenleft dead_abovedot degree
-keycode 45 = 9 parenright dead_acute acute
-keycode 46 = odiaeresis Odiaeresis dead_doubleacute doubleacute
-keycode 47 = udiaeresis Udiaeresis dead_diaeresis diaeresis
-keycode 48 = oacute Oacute dead_cedilla cedilla
-keycode 49 = 0 section notsign
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete comma
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q backslash
-keycode 62 = w W bar
-keycode 63 = e E
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = z Z
-keycode 67 = u U
-keycode 68 = i I Iacute
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = odoubleacute Odoubleacute division
-keycode 72 = uacute Uacute multiply
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S dstroke
-keycode 86 = d D Dstroke
-keycode 87 = f F bracketleft
-keycode 88 = g G bracketright
-keycode 89 = h H
-keycode 90 = j J iacute
-keycode 91 = k K lstroke
-keycode 92 = l L Lstroke
-keycode 93 = eacute Eacute dollar
-keycode 94 = aacute Aacute ssharp
-keycode 95 = udoubleacute Udoubleacute currency
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = y Y greater
-keycode 108 = x X numbersign
-keycode 109 = c C ampersand
-keycode 110 = v V at
-keycode 111 = b B braceleft
-keycode 112 = n N braceright
-keycode 113 = m M less
-keycode 114 = comma question semicolon
-keycode 115 = period colon
-keycode 116 = minus underscore asterisk
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.hu-lat1 b/gkb-new/xmodmap.sun/xmodmap.hu-lat1
deleted file mode 100644
index b891cc6c..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.hu-lat1
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch Multi_key
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L Meta_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 apostrophe asciitilde dead_tilde
-keycode 38 = 2 quotedbl dead_caron caron
-keycode 39 = 3 plus asciicircum dead_circumflex
-keycode 40 = 4 exclam dead_breve breve
-keycode 41 = 5 percent dead_abovering degree
-keycode 42 = 6 slash dead_ogonek ogonek
-keycode 43 = 7 equal grave dead_grave
-keycode 44 = 8 parenleft dead_abovedot degree
-keycode 45 = 9 parenright dead_acute acute
-keycode 46 = odiaeresis Odiaeresis dead_doubleacute doubleacute
-keycode 47 = udiaeresis Udiaeresis dead_diaeresis diaeresis
-keycode 48 = oacute Oacute dead_cedilla cedilla
-keycode 49 = 0 section notsign
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete comma
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q backslash
-keycode 62 = w W bar
-keycode 63 = e E
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = z Z
-keycode 67 = u U
-keycode 68 = i I Iacute
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = otilde Otilde division
-keycode 72 = uacute Uacute multiply
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S dstroke
-keycode 86 = d D Dstroke
-keycode 87 = f F bracketleft
-keycode 88 = g G bracketright
-keycode 89 = h H
-keycode 90 = j J iacute
-keycode 91 = k K lstroke
-keycode 92 = l L Lstroke
-keycode 93 = eacute Eacute dollar
-keycode 94 = aacute Aacute ssharp
-keycode 95 = ucirc Ucirc currency
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = y Y greater
-keycode 108 = x X numbersign
-keycode 109 = c C ampersand
-keycode 110 = v V at
-keycode 111 = b B braceleft
-keycode 112 = n N braceright
-keycode 113 = m M less
-keycode 114 = comma question semicolon
-keycode 115 = period colon
-keycode 116 = minus underscore asterisk
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.il b/gkb-new/xmodmap.sun/xmodmap.il
deleted file mode 100644
index 73bbe23d..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.il
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam 1 exclam
-keycode 38 = 2 at 2 at
-keycode 39 = 3 numbersign 3 numbersign
-keycode 40 = 4 dollar 4 dollar
-keycode 41 = 5 percent 5 percent
-keycode 42 = 6 asciicircum 6 asciicircum
-keycode 43 = 7 ampersand 7 ampersand
-keycode 44 = 8 asterisk 8 asterisk
-keycode 45 = 9 parenleft 9 parenleft
-keycode 46 = 0 parenright 0 parenright
-keycode 47 = minus underscore minus underscore
-keycode 48 = equal plus equal plus
-keycode 49 = grave asciitilde semicolon asciitilde
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q slash Q
-keycode 62 = w W apostrophe W
-keycode 63 = e E hebrew_qoph E
-keycode 64 = r R hebrew_resh R
-keycode 65 = t T hebrew_aleph T
-keycode 66 = y Y hebrew_tet Y
-keycode 67 = u U hebrew_waw U
-keycode 68 = i I hebrew_finalnun I
-keycode 69 = o O hebrew_finalmem O
-keycode 70 = p P hebrew_pe P
-keycode 71 = bracketleft braceleft bracketleft braceleft
-keycode 72 = bracketright braceright bracketright braceright
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A hebrew_shin A
-keycode 85 = s S hebrew_dalet S
-keycode 86 = d D hebrew_gimel D
-keycode 87 = f F hebrew_kaph F
-keycode 88 = g G hebrew_ayin G
-keycode 89 = h H hebrew_yod H
-keycode 90 = j J hebrew_chet J
-keycode 91 = k K hebrew_lamed K
-keycode 92 = l L hebrew_finalkaph L
-keycode 93 = semicolon colon hebrew_finalpe colon
-keycode 94 = apostrophe quotedbl comma quotedbl
-keycode 95 = backslash bar backslash bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z hebrew_zain Z
-keycode 108 = x X hebrew_samech X
-keycode 109 = c C hebrew_bet C
-keycode 110 = v V hebrew_he V
-keycode 111 = b B hebrew_nun B
-keycode 112 = n N hebrew_mem N
-keycode 113 = m M hebrew_zade M
-keycode 114 = comma less hebrew_taw less
-keycode 115 = period greater hebrew_finalzade greater
-keycode 116 = slash question period question
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.is b/gkb-new/xmodmap.sun/xmodmap.is
deleted file mode 100644
index 87684142..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.is
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch Multi_key
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl twosuperior
-keycode 39 = 3 numbersign threesuperior sterling
-keycode 40 = 4 dollar onequarter currency
-keycode 41 = 5 percent onehalf
-keycode 42 = 6 ampersand threequarters
-keycode 43 = 7 slash braceleft
-keycode 44 = 8 parenleft bracketleft
-keycode 45 = 9 parenright bracketright plusminus
-keycode 46 = 0 equal braceright degree
-keycode 47 = odiaeresis Odiaeresis backslash questiondown
-keycode 48 = minus underscore ccedilla
-keycode 49 = degree diaeresis notsign
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q at
-keycode 62 = w W
-keycode 63 = e E EuroSign cent
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = eth ETH dead_diaeresis
-keycode 72 = apostrophe question asciitilde dead_macron
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = ae AE
-keycode 94 = dead_acute Adiaeresis dead_circumflex
-keycode 95 = plus asterisk bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z
-keycode 108 = x X
-keycode 109 = c C
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M
-keycode 114 = comma semicolon
-keycode 115 = period colon periodcentered division
-keycode 116 = thorn THORN
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.it b/gkb-new/xmodmap.sun/xmodmap.it
deleted file mode 100644
index c91f713c..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.it
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl
-keycode 39 = 3 sterling
-keycode 40 = 4 dollar
-keycode 41 = 5 percent
-keycode 42 = 6 ampersand
-keycode 43 = 7 slash
-keycode 44 = 8 parenleft
-keycode 45 = 9 parenright
-keycode 46 = 0 equal
-keycode 47 = apostrophe question grave questiondown
-keycode 48 = igrave asciicircum asciitilde dead_ogonek
-keycode 49 = backslash bar acute
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = w W
-keycode 63 = e E EuroSign cent
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = egrave eacute bracketleft dead_abovering
-keycode 72 = plus asterisk bracketright dead_macron
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = ograve ccedilla at dead_doubleacute
-keycode 94 = agrave degree numbersign numbersign
-keycode 95 = ugrave section
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z
-keycode 108 = x X
-keycode 109 = c C
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M
-keycode 114 = comma semicolon
-keycode 115 = period colon
-keycode 116 = minus underscore
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.it-type4 b/gkb-new/xmodmap.sun/xmodmap.it-type4
deleted file mode 100644
index e53c6949..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.it-type4
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = L1 L1 SunStop
-keycode 9 =
-keycode 10 = L2 L2 SunAgain
-keycode 11 =
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = SunF36
-keycode 17 = F4
-keycode 18 = SunF37
-keycode 19 = F5
-keycode 20 = SunAltGraph
-keycode 21 = F6
-keycode 22 = bracketright braceright guillemotright
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 =
-keycode 28 = R1 R1 Pause
-keycode 29 = R2 R2 Print
-keycode 30 = R3 R3 Scroll_Lock Break
-keycode 31 =
-keycode 32 = L3 L3 SunProps
-keycode 33 = L4 L4 SunUndo
-keycode 34 =
-keycode 35 =
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl twosuperior
-keycode 39 = 3 sterling threesuperior
-keycode 40 = 4 dollar
-keycode 41 = 5 percent
-keycode 42 = 6 ampersand notsign
-keycode 43 = 7 slash
-keycode 44 = 8 parenleft
-keycode 45 = 9 parenright backslash
-keycode 46 = 0 equal bar
-keycode 47 = quoteright question quoteleft
-keycode 48 = igrave asciicircum
-keycode 49 = ugrave section
-keycode 50 = BackSpace
-keycode 51 =
-keycode 52 = R4 R4 KP_Equal
-keycode 53 = R5 R5 KP_Divide
-keycode 54 = R6 R6 KP_Multiply
-keycode 55 =
-keycode 56 = L5 L5 SunFront
-keycode 57 = Delete Delete KP_Decimal
-keycode 58 = L6 L6 SunCopy
-keycode 59 =
-keycode 60 = Tab
-keycode 61 = Q
-keycode 62 = W
-keycode 63 = e E currency
-keycode 64 = R
-keycode 65 = T
-keycode 66 = Y
-keycode 67 = U
-keycode 68 = I
-keycode 69 = O
-keycode 70 = P
-keycode 71 = egrave eacute
-keycode 72 = plus asterisk asciitilde
-keycode 73 = Delete
-keycode 74 = SunCompose
-keycode 75 = R7 R7 KP_7 Home
-keycode 76 = Up R8 KP_8
-keycode 77 = R9 R9 KP_9 Prior
-keycode 78 = KP_Subtract
-keycode 79 = L7 L7 SunOpen
-keycode 80 = L8 L8 SunPaste
-keycode 81 =
-keycode 82 =
-keycode 83 = Caps_Lock
-keycode 84 = A
-keycode 85 = S
-keycode 86 = D
-keycode 87 = F
-keycode 88 = G
-keycode 89 = H
-keycode 90 = J
-keycode 91 = K
-keycode 92 = L
-keycode 93 = ograve ccedilla at
-keycode 94 = agrave degree numbersign
-keycode 95 = bracketleft braceleft guillemotleft
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = Left R10 KP_4
-keycode 99 = R11 R11 KP_5
-keycode 100 = Right R12 KP_6
-keycode 101 = KP_Insert KP_Insert KP_0
-keycode 102 = L9 L9 SunFind
-keycode 103 =
-keycode 104 = L10 L10 SunCut
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = Z
-keycode 108 = X
-keycode 109 = C
-keycode 110 = V
-keycode 111 = B
-keycode 112 = N
-keycode 113 = M
-keycode 114 = comma semicolon
-keycode 115 = period colon
-keycode 116 = minus underscore
-keycode 117 = Shift_R
-keycode 118 = Linefeed
-keycode 119 = R13 R13 KP_1 End
-keycode 120 = Down R14 KP_2
-keycode 121 = R15 R15 KP_3 Next
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Control_L
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 =
-keycode 131 = less greater
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.it-usb b/gkb-new/xmodmap.sun/xmodmap.it-usb
deleted file mode 100644
index c7e45ec2..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.it-usb
+++ /dev/null
@@ -1,247 +0,0 @@
-keycode 8 =
-keycode 9 =
-keycode 10 =
-keycode 11 = A
-keycode 12 = B
-keycode 13 = C
-keycode 14 = D
-keycode 15 = e E currency
-keycode 16 = F
-keycode 17 = G
-keycode 18 = H
-keycode 19 = I
-keycode 20 = J
-keycode 21 = K
-keycode 22 = L
-keycode 23 = M
-keycode 24 = N
-keycode 25 = O
-keycode 26 = P
-keycode 27 = Q
-keycode 28 = R
-keycode 29 = S
-keycode 30 = T
-keycode 31 = U
-keycode 32 = V
-keycode 33 = W
-keycode 34 = X
-keycode 35 = Y
-keycode 36 = Z
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl
-keycode 39 = 3 sterling
-keycode 40 = 4 dollar
-keycode 41 = 5 percent
-keycode 42 = 6 ampersand
-keycode 43 = 7 slash
-keycode 44 = 8 parenleft braceleft
-keycode 45 = 9 parenright braceright
-keycode 46 = 0 equal
-keycode 47 = Return
-keycode 48 = Escape
-keycode 49 = BackSpace
-keycode 50 = Tab
-keycode 51 = space
-keycode 52 = quoteright question quoteleft
-keycode 53 = igrave asciicircum
-keycode 54 = egrave eacute bracketleft
-keycode 55 = plus asterisk bracketright
-keycode 56 =
-keycode 57 = ugrave section asciitilde
-keycode 58 = ograve ccedilla at
-keycode 59 = agrave degree numbersign
-keycode 60 = backslash bar
-keycode 61 = comma semicolon
-keycode 62 = period colon
-keycode 63 = minus underscore
-keycode 64 = Caps_Lock
-keycode 65 = F1
-keycode 66 = F2
-keycode 67 = F3
-keycode 68 = F4
-keycode 69 = F5
-keycode 70 = F6
-keycode 71 = F7
-keycode 72 = F8
-keycode 73 = F9
-keycode 74 = F10
-keycode 75 = SunF36
-keycode 76 = SunF37
-keycode 77 = R2 R2 Print SunSys_Req
-keycode 78 = R3 R3 Scroll_Lock
-keycode 79 = R1 R1 Pause Break
-keycode 80 = Insert
-keycode 81 = Home
-keycode 82 = Prior
-keycode 83 = Delete
-keycode 84 = End
-keycode 85 = Next
-keycode 86 = Right
-keycode 87 = Left
-keycode 88 = Down
-keycode 89 = Up
-keycode 90 = Num_Lock
-keycode 91 = R5 R5 KP_Divide
-keycode 92 = R6 R6 KP_Multiply
-keycode 93 = R4 R4 KP_Subtract
-keycode 94 = KP_Add
-keycode 95 = KP_Enter
-keycode 96 = R13 R13 KP_1 End
-keycode 97 = Down R14 KP_2
-keycode 98 = R15 R15 KP_3 Next
-keycode 99 = Left R10 KP_4
-keycode 100 = R11 R11 KP_5
-keycode 101 = Right R12 KP_6
-keycode 102 = R7 R7 KP_7 Home
-keycode 103 = Up R8 KP_8
-keycode 104 = R9 R9 KP_9 Prior
-keycode 105 = KP_Insert KP_Insert KP_0
-keycode 106 = Delete Delete KP_Decimal
-keycode 107 = less greater
-keycode 108 = SunCompose
-keycode 109 = SunPowerSwitch SunPowerSwitchShift
-keycode 110 =
-keycode 111 =
-keycode 112 =
-keycode 113 =
-keycode 114 =
-keycode 115 =
-keycode 116 =
-keycode 117 =
-keycode 118 =
-keycode 119 =
-keycode 120 =
-keycode 121 =
-keycode 122 =
-keycode 123 = L7 L7 SunOpen
-keycode 124 = Help
-keycode 125 = L3 L3 SunProps
-keycode 126 = L5 L5 SunFront
-keycode 127 = L1 L1 SunStop
-keycode 128 = L2 L2 SunAgain
-keycode 129 = L4 L4 SunUndo
-keycode 130 = L10 L10 SunCut
-keycode 131 = L6 L6 SunCopy
-keycode 132 = L8 L8 SunPaste
-keycode 133 = L9 L9 SunFind
-keycode 134 = SunAudioMute SunVideoDegauss
-keycode 135 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 136 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 137 =
-keycode 138 =
-keycode 139 =
-keycode 140 =
-keycode 141 =
-keycode 142 =
-keycode 143 =
-keycode 144 =
-keycode 145 =
-keycode 146 =
-keycode 147 =
-keycode 148 =
-keycode 149 =
-keycode 150 =
-keycode 151 =
-keycode 152 =
-keycode 153 =
-keycode 154 =
-keycode 155 =
-keycode 156 =
-keycode 157 =
-keycode 158 =
-keycode 159 =
-keycode 160 =
-keycode 161 =
-keycode 162 =
-keycode 163 =
-keycode 164 =
-keycode 165 =
-keycode 166 =
-keycode 167 =
-keycode 168 =
-keycode 169 =
-keycode 170 =
-keycode 171 =
-keycode 172 =
-keycode 173 =
-keycode 174 =
-keycode 175 =
-keycode 176 =
-keycode 177 =
-keycode 178 =
-keycode 179 =
-keycode 180 =
-keycode 181 =
-keycode 182 =
-keycode 183 =
-keycode 184 =
-keycode 185 =
-keycode 186 =
-keycode 187 =
-keycode 188 =
-keycode 189 =
-keycode 190 =
-keycode 191 =
-keycode 192 =
-keycode 193 =
-keycode 194 =
-keycode 195 =
-keycode 196 =
-keycode 197 =
-keycode 198 =
-keycode 199 =
-keycode 200 =
-keycode 201 =
-keycode 202 =
-keycode 203 =
-keycode 204 =
-keycode 205 =
-keycode 206 =
-keycode 207 =
-keycode 208 =
-keycode 209 =
-keycode 210 =
-keycode 211 =
-keycode 212 =
-keycode 213 =
-keycode 214 =
-keycode 215 =
-keycode 216 =
-keycode 217 =
-keycode 218 =
-keycode 219 =
-keycode 220 =
-keycode 221 =
-keycode 222 =
-keycode 223 =
-keycode 224 =
-keycode 225 =
-keycode 226 =
-keycode 227 =
-keycode 228 =
-keycode 229 =
-keycode 230 =
-keycode 231 = Control_L
-keycode 232 = Shift_L
-keycode 233 = Alt_L
-keycode 234 = Meta_L
-keycode 235 =
-keycode 236 = Shift_R
-keycode 237 = SunAltGraph
-keycode 238 = Meta_R
-keycode 239 =
-keycode 240 =
-keycode 241 =
-keycode 242 =
-keycode 243 =
-keycode 244 =
-keycode 245 =
-keycode 246 =
-keycode 247 =
-keycode 248 =
-keycode 249 =
-keycode 250 =
-keycode 251 =
-keycode 252 =
-keycode 253 =
-keycode 254 =
diff --git a/gkb-new/xmodmap.sun/xmodmap.jp b/gkb-new/xmodmap.sun/xmodmap.jp
deleted file mode 100644
index 712f699d..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.jp
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Alt_R Meta_R
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L Meta_L
-keycode 27 = Up
-keycode 28 = Pause Break Break
-keycode 29 = Print Execute Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam kana_NU
-keycode 38 = 2 quotedbl kana_FU
-keycode 39 = 3 numbersign kana_A kana_a
-keycode 40 = 4 dollar kana_U kana_u
-keycode 41 = 5 percent kana_E kana_e
-keycode 42 = 6 ampersand kana_O kana_o
-keycode 43 = 7 apostrophe kana_YA kana_ya
-keycode 44 = 8 parenleft kana_YU kana_yu
-keycode 45 = 9 parenright kana_YO kana_yo
-keycode 46 = 0 asciitilde kana_WA kana_WO
-keycode 47 = minus equal kana_HO
-keycode 48 = asciicircum asciitilde kana_HE
-keycode 49 = grave asciitilde acute
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q kana_TA
-keycode 62 = w W kana_TE
-keycode 63 = e E kana_I kana_i
-keycode 64 = r R kana_SU
-keycode 65 = t T kana_KA
-keycode 66 = y Y kana_N
-keycode 67 = u U kana_NA
-keycode 68 = i I kana_NI
-keycode 69 = o O kana_RA
-keycode 70 = p P kana_SE
-keycode 71 = at grave voicedsound
-keycode 72 = bracketleft braceleft semivoicedsound kana_openingbracket
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A kana_CHI
-keycode 85 = s S kana_TO
-keycode 86 = d D kana_SHI
-keycode 87 = f F kana_HA
-keycode 88 = g G kana_KI
-keycode 89 = h H kana_KU
-keycode 90 = j J kana_MA
-keycode 91 = k K kana_NO
-keycode 92 = l L kana_RI
-keycode 93 = semicolon plus kana_RE
-keycode 94 = colon asterisk kana_KE
-keycode 95 = backslash bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z kana_TSU kana_tsu
-keycode 108 = x X kana_SA
-keycode 109 = c C kana_SO
-keycode 110 = v V kana_HI
-keycode 111 = b B kana_KO
-keycode 112 = n N kana_MI
-keycode 113 = m M kana_MO
-keycode 114 = comma less kana_NE kana_comma
-keycode 115 = period greater kana_RU kana_fullstop
-keycode 116 = slash question kana_ME kana_conjunctive
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock Eisu_toggle
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.jp-type4 b/gkb-new/xmodmap.sun/xmodmap.jp-type4
deleted file mode 100644
index 2e3a8c74..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.jp-type4
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = L1 L1 SunStop
-keycode 9 =
-keycode 10 = L2 L2 SunAgain
-keycode 11 =
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = SunF36
-keycode 17 = F4
-keycode 18 = SunF37
-keycode 19 = F5
-keycode 20 = SunAltGraph
-keycode 21 = F6
-keycode 22 = Linefeed
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 =
-keycode 28 = R1 R1 Pause
-keycode 29 = R2 R2 Print
-keycode 30 = R3 R3 Scroll_Lock Break
-keycode 31 =
-keycode 32 = L3 L3 SunProps
-keycode 33 = L4 L4 SunUndo
-keycode 34 =
-keycode 35 =
-keycode 36 = Escape
-keycode 37 = 1 exclam kana_NU
-keycode 38 = 2 quotedbl kana_FU
-keycode 39 = 3 numbersign kana_A kana_a
-keycode 40 = 4 dollar kana_U kana_u
-keycode 41 = 5 percent kana_E kana_e
-keycode 42 = 6 ampersand kana_O kana_o
-keycode 43 = 7 quoteright kana_YA kana_ya
-keycode 44 = 8 parenleft kana_YU kana_yu
-keycode 45 = 9 parenright kana_YO kana_yo
-keycode 46 = 0 0 kana_WA kana_WO
-keycode 47 = minus equal kana_HO
-keycode 48 = asciicircum asciitilde kana_HE
-keycode 49 = bracketright braceright kana_MU kana_closingbracket
-keycode 50 = BackSpace
-keycode 51 =
-keycode 52 = R4 R4 KP_Equal
-keycode 53 = R5 R5 KP_Divide
-keycode 54 = R6 R6 KP_Multiply
-keycode 55 =
-keycode 56 = L5 L5 SunFront
-keycode 57 = Delete Delete KP_Decimal
-keycode 58 = L6 L6 SunCopy
-keycode 59 =
-keycode 60 = Tab
-keycode 61 = q Q kana_TA
-keycode 62 = w W kana_TE
-keycode 63 = e E kana_I kana_i
-keycode 64 = r R kana_SU
-keycode 65 = t T kana_KA
-keycode 66 = y Y kana_N
-keycode 67 = u U kana_NA
-keycode 68 = i I kana_NI
-keycode 69 = o O kana_RA
-keycode 70 = p P kana_SE
-keycode 71 = at quoteleft voicedsound
-keycode 72 = bracketleft braceleft semivoicedsound kana_openingbracket
-keycode 73 = Delete
-keycode 74 = SunCompose
-keycode 75 = R7 R7 KP_7 Home
-keycode 76 = Up R8 KP_8
-keycode 77 = R9 R9 KP_9 Prior
-keycode 78 = KP_Subtract
-keycode 79 = L7 L7 SunOpen
-keycode 80 = L8 L8 SunPaste
-keycode 81 =
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A kana_CHI
-keycode 85 = s S kana_TO
-keycode 86 = d D kana_SHI
-keycode 87 = f F kana_HA
-keycode 88 = g G kana_KI
-keycode 89 = h H kana_KU
-keycode 90 = j J kana_MA
-keycode 91 = k K kana_NO
-keycode 92 = l L kana_RI
-keycode 93 = semicolon plus kana_RE
-keycode 94 = colon asterisk kana_KE
-keycode 95 = backslash bar prolongedsound
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = Left R10 KP_4
-keycode 99 = R11 R11 KP_5
-keycode 100 = Right R12 KP_6
-keycode 101 = KP_Insert KP_Insert KP_0
-keycode 102 = L9 L9 SunFind
-keycode 103 =
-keycode 104 = L10 L10 SunCut
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z kana_TSU kana_tsu
-keycode 108 = x X kana_SA
-keycode 109 = c C kana_SO
-keycode 110 = v V kana_HI
-keycode 111 = b B kana_KO
-keycode 112 = n N kana_MI
-keycode 113 = m M kana_MO
-keycode 114 = comma less kana_NE kana_comma
-keycode 115 = period greater kana_RU kana_fullstop
-keycode 116 = slash question kana_ME kana_conjunctive
-keycode 117 = Shift_R
-keycode 118 = backslash underscore kana_RO
-keycode 119 = R13 R13 KP_1 End
-keycode 120 = Down R14 KP_2
-keycode 121 = R15 R15 KP_3 Next
-keycode 122 = Execute
-keycode 123 = Kanji
-keycode 124 = Henkan_Mode
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 =
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.lt b/gkb-new/xmodmap.sun/xmodmap.lt
deleted file mode 100644
index b321630b..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.lt
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam aogonek Aogonek
-keycode 38 = 2 at ccaron Ccaron
-keycode 39 = 3 numbersign eogonek Eogonek
-keycode 40 = 4 dollar eabovedot Eabovedot
-keycode 41 = 5 percent iogonek Iogonek
-keycode 42 = 6 asciicircum scaron Scaron
-keycode 43 = 7 ampersand uogonek Uogonek
-keycode 44 = 8 asterisk umacron Umacron
-keycode 45 = 9 parenleft doublelowquotemark parenleft
-keycode 46 = 0 parenright leftdoublequotemark parenright
-keycode 47 = minus underscore minus underscore
-keycode 48 = equal plus zcaron Zcaron
-keycode 49 = grave asciitilde grave asciitilde
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q q Q
-keycode 62 = w W w W
-keycode 63 = e E e E
-keycode 64 = r R r R
-keycode 65 = t T t T
-keycode 66 = y Y y Y
-keycode 67 = u U u U
-keycode 68 = i I i I
-keycode 69 = o O o O
-keycode 70 = p P p P
-keycode 71 = bracketleft braceleft bracketleft braceleft
-keycode 72 = bracketright braceright bracketright braceright
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A a A
-keycode 85 = s S s S
-keycode 86 = d D d D
-keycode 87 = f F f F
-keycode 88 = g G g G
-keycode 89 = h H h H
-keycode 90 = j J j J
-keycode 91 = k K k K
-keycode 92 = l L l L
-keycode 93 = semicolon colon semicolon colon
-keycode 94 = apostrophe quotedbl apostrophe quotedbl
-keycode 95 = backslash bar backslash bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z z Z
-keycode 108 = x X x X
-keycode 109 = c C c C
-keycode 110 = v V v V
-keycode 111 = b B b B
-keycode 112 = n N n N
-keycode 113 = m M m M
-keycode 114 = comma less comma less
-keycode 115 = period greater period greater
-keycode 116 = slash question slash question
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.lv b/gkb-new/xmodmap.sun/xmodmap.lv
deleted file mode 100644
index 847b335b..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.lv
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 at
-keycode 39 = 3 numbersign
-keycode 40 = 4 dollar EuroSign cent
-keycode 41 = 5 percent
-keycode 42 = 6 asciicircum
-keycode 43 = 7 ampersand
-keycode 44 = 8 asterisk
-keycode 45 = 9 parenleft
-keycode 46 = 0 parenright
-keycode 47 = minus underscore
-keycode 48 = equal plus
-keycode 49 = grave asciitilde acute
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = w W
-keycode 63 = e E emacron Emacron
-keycode 64 = r R rcedilla Rcedilla
-keycode 65 = t T
-keycode 66 = y Y
-keycode 67 = u U umacron Umacron
-keycode 68 = i I imacron Imacron
-keycode 69 = o O omacron Omacron
-keycode 70 = p P
-keycode 71 = bracketleft braceleft
-keycode 72 = bracketright braceright
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A amacron Amacron
-keycode 85 = s S scaron Scaron
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G gcedilla Gcedilla
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K kcedilla Kcedilla
-keycode 92 = l L lcedilla Lcedilla
-keycode 93 = semicolon colon
-keycode 94 = apostrophe quotedbl leftdoublequotemark doublelowquotemark
-keycode 95 = backslash bar
-keycode 96 = Return ISO_Next_Group
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z zcaron Zcaron
-keycode 108 = x X
-keycode 109 = c C ccaron Ccaron
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N ncedilla Ncedilla
-keycode 113 = m M
-keycode 114 = comma less
-keycode 115 = period greater
-keycode 116 = slash question
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space space nobreakspace nobreakspace
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.mk b/gkb-new/xmodmap.sun/xmodmap.mk
deleted file mode 100644
index 70faf23c..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.mk
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam 1 exclam
-keycode 38 = 2 at 2 doublelowquotemark
-keycode 39 = 3 numbersign 3 leftdoublequotemark
-keycode 40 = 4 dollar 4 dollar
-keycode 41 = 5 percent 5 percent
-keycode 42 = 6 asciicircum 6 asciicircum
-keycode 43 = 7 ampersand 7 ampersand
-keycode 44 = 8 asterisk 8 asterisk
-keycode 45 = 9 parenleft 9 parenleft
-keycode 46 = 0 parenright 0 parenright
-keycode 47 = minus underscore minus underscore
-keycode 48 = equal plus equal plus
-keycode 49 = grave asciitilde grave asciitilde
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q Cyrillic_lje Cyrillic_LJE
-keycode 62 = w W Cyrillic_nje Cyrillic_NJE
-keycode 63 = e E Cyrillic_ie Cyrillic_IE
-keycode 64 = r R Cyrillic_er Cyrillic_ER
-keycode 65 = t T Cyrillic_te Cyrillic_TE
-keycode 66 = y Y Macedonia_dse Macedonia_DSE
-keycode 67 = u U Cyrillic_u Cyrillic_U
-keycode 68 = i I Cyrillic_i Cyrillic_I
-keycode 69 = o O Cyrillic_o Cyrillic_O
-keycode 70 = p P Cyrillic_pe Cyrillic_PE
-keycode 71 = bracketleft braceleft Cyrillic_sha Cyrillic_SHA
-keycode 72 = bracketright braceright Macedonia_gje Macedonia_GJE
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A Cyrillic_a Cyrillic_A
-keycode 85 = s S Cyrillic_es Cyrillic_ES
-keycode 86 = d D Cyrillic_de Cyrillic_DE
-keycode 87 = f F Cyrillic_ef Cyrillic_EF
-keycode 88 = g G Cyrillic_ghe Cyrillic_GHE
-keycode 89 = h H Cyrillic_ha Cyrillic_HA
-keycode 90 = j J Cyrillic_je Cyrillic_JE
-keycode 91 = k K Cyrillic_ka Cyrillic_KA
-keycode 92 = l L Cyrillic_el Cyrillic_EL
-keycode 93 = semicolon colon Cyrillic_che Cyrillic_CHE
-keycode 94 = apostrophe quotedbl Macedonia_kje Macedonia_KJE
-keycode 95 = backslash bar Cyrillic_zhe Cyrillic_ZHE
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z Cyrillic_ze Cyrillic_ZE
-keycode 108 = x X Cyrillic_dzhe Cyrillic_DZHE
-keycode 109 = c C Cyrillic_tse Cyrillic_TSE
-keycode 110 = v V Cyrillic_ve Cyrillic_VE
-keycode 111 = b B Cyrillic_be Cyrillic_BE
-keycode 112 = n N Cyrillic_en Cyrillic_EN
-keycode 113 = m M Cyrillic_em Cyrillic_EM
-keycode 114 = comma less comma semicolon
-keycode 115 = period greater period colon
-keycode 116 = slash question slash question
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.mn b/gkb-new/xmodmap.sun/xmodmap.mn
deleted file mode 100644
index f17e21ae..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.mn
+++ /dev/null
@@ -1,128 +0,0 @@
-! Mongolian cyrillic keymap
-! Generated by Sanlig Badral <[email protected]>
-
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam 1 numerosign
-keycode 38 = 2 at 2 minus
-keycode 39 = 3 numbersign 3 quotedbl
-keycode 40 = 4 dollar 4 U20AE
-keycode 41 = 5 percent 5 colon
-keycode 42 = 6 asciicircum 6 period
-keycode 43 = 7 ampersand 7 underscore
-keycode 44 = 8 asterisk 8 comma
-keycode 45 = 9 parenleft 9 percent
-keycode 46 = 0 parenright 0 question
-keycode 47 = minus underscore Cyrillic_ie Cyrillic_IE
-keycode 48 = equal plus Cyrillic_shcha Cyrillic_SHCHA
-keycode 49 = grave asciitilde Cyrillic_yu Cyrillic_YU
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q Cyrillic_ef Cyrillic_EF
-keycode 62 = w W Cyrillic_tse Cyrillic_TSE
-keycode 63 = e E Cyrillic_u Cyrillic_U
-keycode 64 = r R Cyrillic_zhe Cyrillic_ZHE
-keycode 65 = t T Cyrillic_e Cyrillic_E
-keycode 66 = y Y Cyrillic_en Cyrillic_EN
-keycode 67 = u U Cyrillic_ghe Cyrillic_GHE
-keycode 68 = i I Cyrillic_sha Cyrillic_SHA
-keycode 69 = o O U04AF U04AE
-keycode 70 = p P Cyrillic_ze Cyrillic_ZE
-keycode 71 = bracketleft braceleft Cyrillic_ka Cyrillic_KA
-keycode 72 = bracketright braceright Cyrillic_hardsign Cyrillic_HARDSIGN
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A Cyrillic_shorti Cyrillic_SHORTI
-keycode 85 = s S Cyrillic_yeru Cyrillic_YERU
-keycode 86 = d D Cyrillic_be Cyrillic_BE
-keycode 87 = f F U04E9 U04E8
-keycode 88 = g G Cyrillic_a Cyrillic_A
-keycode 89 = h H Cyrillic_ha Cyrillic_HA
-keycode 90 = j J CCyrillic_er Cyrillic_ER
-keycode 91 = k K Cyrillic_o Cyrillic_O
-keycode 92 = l L Cyrillic_el Cyrillic_EL
-keycode 93 = semicolon colon Cyrillic_de Cyrillic_DE
-keycode 94 = apostrophe quotedbl Cyrillic_pe Cyrillic_PE
-keycode 95 = backslash bar backslash bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z Cyrillic_ya Cyrillic_YA
-keycode 108 = x X Cyrillic_che Cyrillic_CHE
-keycode 109 = c C Cyrillic_io Cyrillic_IO
-keycode 110 = v V Cyrillic_es Cyrillic_ES
-keycode 111 = b B Cyrillic_em Cyrillic_EM
-keycode 112 = n N Cyrillic_i Cyrillic_I
-keycode 113 = m M Cyrillic_te Cyrillic_TE
-keycode 114 = comma less Cyrillic_softsign Cyrillic_SOFTSIGN
-keycode 115 = period greater Cyrillic_ve Cyrillic_VE
-keycode 116 = slash question slash question
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.no b/gkb-new/xmodmap.sun/xmodmap.no
deleted file mode 100644
index 7e81c43f..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.no
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam exclamdown onesuperior
-keycode 38 = 2 quotedbl at twosuperior
-keycode 39 = 3 numbersign sterling threesuperior
-keycode 40 = 4 currency dollar onequarter
-keycode 41 = 5 percent NoSymbol cent
-keycode 42 = 6 ampersand yen
-keycode 43 = 7 slash braceleft division
-keycode 44 = 8 parenleft bracketleft guillemotleft
-keycode 45 = 9 parenright bracketright guillemotright
-keycode 46 = 0 equal braceright degree
-keycode 47 = plus question plusminus questiondown
-keycode 48 = backslash dead_grave dead_acute notsign
-keycode 49 = bar section brokenbar paragraph
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = w W
-keycode 63 = e E EuroSign cent
-keycode 64 = r R registered
-keycode 65 = t T thorn THORN
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O oe OE
-keycode 70 = p P
-keycode 71 = aring Aring
-keycode 72 = dead_diaeresis dead_circumflex dead_tilde dead_caron
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A ordfeminine masculine
-keycode 85 = s S
-keycode 86 = d D eth ETH
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = oslash Ooblique
-keycode 94 = ae AE acute
-keycode 95 = apostrophe asterisk dead_doubleacute multiply
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z
-keycode 108 = x X
-keycode 109 = c C copyright
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M
-keycode 114 = comma semicolon dead_cedilla dead_ogonek
-keycode 115 = period colon periodcentered dead_abovedot
-keycode 116 = minus underscore hyphen macron
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space space nobreakspace nobreakspace
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.pl b/gkb-new/xmodmap.sun/xmodmap.pl
deleted file mode 100644
index 45178942..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.pl
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 at
-keycode 39 = 3 numbersign
-keycode 40 = 4 dollar
-keycode 41 = 5 percent
-keycode 42 = 6 asciicircum
-keycode 43 = 7 ampersand
-keycode 44 = 8 asterisk
-keycode 45 = 9 parenleft
-keycode 46 = 0 parenright
-keycode 47 = minus underscore
-keycode 48 = equal plus
-keycode 49 = grave asciitilde acute
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = w W
-keycode 63 = e E eogonek Eogonek
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O oacute Oacute
-keycode 70 = p P
-keycode 71 = bracketleft braceleft
-keycode 72 = bracketright braceright
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A aogonek Aogonek
-keycode 85 = s S sacute Sacute
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L lstroke Lstroke
-keycode 93 = semicolon colon
-keycode 94 = apostrophe quotedbl acute
-keycode 95 = backslash bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z zabovedot Zabovedot
-keycode 108 = x X zacute Zacute
-keycode 109 = c C cacute Cacute
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N nacute Nacute
-keycode 113 = m M
-keycode 114 = comma less
-keycode 115 = period greater
-keycode 116 = slash question
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.pt b/gkb-new/xmodmap.sun/xmodmap.pt
deleted file mode 100644
index 528149eb..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.pt
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch Multi_key
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl at oneeighth
-keycode 39 = 3 numbersign sterling sterling
-keycode 40 = 4 dollar section dollar
-keycode 41 = 5 percent
-keycode 42 = 6 ampersand
-keycode 43 = 7 slash
-keycode 44 = 8 parenleft
-keycode 45 = 9 parenright
-keycode 46 = 0 equal
-keycode 47 = apostrophe question
-keycode 48 = guillemotleft guillemotright
-keycode 49 = backslash bar acute
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = w W
-keycode 63 = e E EuroSign cent
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = plus asterisk dead_diaeresis
-keycode 72 = dead_acute dead_grave
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = ccedilla Ccedilla
-keycode 94 = masculine ordfeminine acute
-keycode 95 = dead_tilde dead_circumflex
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z
-keycode 108 = x X
-keycode 109 = c C
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M
-keycode 114 = comma semicolon
-keycode 115 = period colon
-keycode 116 = minus underscore
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.pt-type4 b/gkb-new/xmodmap.sun/xmodmap.pt-type4
deleted file mode 100644
index c8306939..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.pt-type4
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = L1 L1 SunStop
-keycode 9 =
-keycode 10 = L2 L2 SunAgain
-keycode 11 =
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = SunF36
-keycode 17 = F4
-keycode 18 = SunF37
-keycode 19 = F5
-keycode 20 = SunAltGraph
-keycode 21 = F6
-keycode 22 = bracketright braceright guillemotright
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 =
-keycode 28 = R1 R1 Pause
-keycode 29 = R2 R2 Print
-keycode 30 = R3 R3 Scroll_Lock Break
-keycode 31 =
-keycode 32 = L3 L3 SunProps
-keycode 33 = L4 L4 SunUndo
-keycode 34 =
-keycode 35 =
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl at
-keycode 39 = 3 numbersign sterling
-keycode 40 = 4 dollar section
-keycode 41 = 5 percent
-keycode 42 = 6 ampersand notsign
-keycode 43 = 7 slash
-keycode 44 = 8 parenleft
-keycode 45 = 9 parenright backslash
-keycode 46 = 0 equal bar
-keycode 47 = quoteright question quoteleft
-keycode 48 = exclamdown questiondown
-keycode 49 = SunFA_Tilde SunFA_Circum asciicircum
-keycode 50 = BackSpace
-keycode 51 =
-keycode 52 = R4 R4 KP_Equal
-keycode 53 = R5 R5 KP_Divide
-keycode 54 = R6 R6 KP_Multiply
-keycode 55 =
-keycode 56 = L5 L5 SunFront
-keycode 57 = Delete Delete KP_Decimal
-keycode 58 = L6 L6 SunCopy
-keycode 59 =
-keycode 60 = Tab
-keycode 61 = Q
-keycode 62 = W
-keycode 63 = e E currency
-keycode 64 = R
-keycode 65 = T
-keycode 66 = Y
-keycode 67 = U
-keycode 68 = I
-keycode 69 = O
-keycode 70 = P
-keycode 71 = SunFA_Diaeresis asterisk plus
-keycode 72 = SunFA_Acute SunFA_Grave asciitilde
-keycode 73 = Delete
-keycode 74 = SunCompose
-keycode 75 = R7 R7 KP_7 Home
-keycode 76 = Up R8 KP_8
-keycode 77 = R9 R9 KP_9 Prior
-keycode 78 = KP_Subtract
-keycode 79 = L7 L7 SunOpen
-keycode 80 = L8 L8 SunPaste
-keycode 81 =
-keycode 82 =
-keycode 83 = Caps_Lock
-keycode 84 = A
-keycode 85 = S
-keycode 86 = D
-keycode 87 = F
-keycode 88 = G
-keycode 89 = H
-keycode 90 = J
-keycode 91 = K
-keycode 92 = L
-keycode 93 = Ccedilla
-keycode 94 = masculine ordfeminine
-keycode 95 = bracketleft braceleft guillemotleft
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = Left R10 KP_4
-keycode 99 = R11 R11 KP_5
-keycode 100 = Right R12 KP_6
-keycode 101 = KP_Insert KP_Insert KP_0
-keycode 102 = L9 L9 SunFind
-keycode 103 =
-keycode 104 = L10 L10 SunCut
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = Z
-keycode 108 = X
-keycode 109 = C
-keycode 110 = V
-keycode 111 = B
-keycode 112 = N
-keycode 113 = M
-keycode 114 = comma semicolon
-keycode 115 = period colon
-keycode 116 = minus underscore
-keycode 117 = Shift_R
-keycode 118 = Linefeed
-keycode 119 = R13 R13 KP_1 End
-keycode 120 = Down R14 KP_2
-keycode 121 = R15 R15 KP_3 Next
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Control_L
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 =
-keycode 131 = less greater
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.ro b/gkb-new/xmodmap.sun/xmodmap.ro
deleted file mode 100644
index cbfeb914..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.ro
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 at
-keycode 39 = 3 numbersign
-keycode 40 = 4 dollar
-keycode 41 = 5 percent
-keycode 42 = 6 asciicircum
-keycode 43 = 7 ampersand
-keycode 44 = 8 asterisk
-keycode 45 = 9 parenleft
-keycode 46 = 0 parenright
-keycode 47 = minus underscore
-keycode 48 = equal plus
-keycode 49 = grave asciitilde acute
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q acircumflex Acircumflex
-keycode 62 = w W
-keycode 63 = e E
-keycode 64 = r R
-keycode 65 = t T tcedilla Tcedilla
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I icircumflex Icircumflex
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = bracketleft braceleft
-keycode 72 = bracketright braceright
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A abreve Abreve
-keycode 85 = s S scedilla Scedilla
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = semicolon colon
-keycode 94 = apostrophe quotedbl acute
-keycode 95 = backslash bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z
-keycode 108 = x X
-keycode 109 = c C
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M
-keycode 114 = comma less
-keycode 115 = period greater
-keycode 116 = slash question
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.ru b/gkb-new/xmodmap.sun/xmodmap.ru
deleted file mode 100644
index 3fe3fb1c..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.ru
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam 1 exclam
-keycode 38 = 2 at 2 quotedbl
-keycode 39 = 3 numbersign 3 apostrophe
-keycode 40 = 4 dollar 4 asterisk
-keycode 41 = 5 percent 5 colon
-keycode 42 = 6 asciicircum 6 comma
-keycode 43 = 7 ampersand 7 period
-keycode 44 = 8 asterisk 8 semicolon
-keycode 45 = 9 parenleft 9 parenleft
-keycode 46 = 0 parenright 0 parenright
-keycode 47 = minus underscore minus underscore
-keycode 48 = equal plus equal plus
-keycode 49 = grave asciitilde Cyrillic_io Cyrillic_IO
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q Cyrillic_shorti Cyrillic_SHORTI
-keycode 62 = w W Cyrillic_tse Cyrillic_TSE
-keycode 63 = e E Cyrillic_u Cyrillic_U
-keycode 64 = r R Cyrillic_ka Cyrillic_KA
-keycode 65 = t T Cyrillic_ie Cyrillic_IE
-keycode 66 = y Y Cyrillic_en Cyrillic_EN
-keycode 67 = u U Cyrillic_ghe Cyrillic_GHE
-keycode 68 = i I Cyrillic_sha Cyrillic_SHA
-keycode 69 = o O Cyrillic_shcha Cyrillic_SHCHA
-keycode 70 = p P Cyrillic_ze Cyrillic_ZE
-keycode 71 = bracketleft braceleft Cyrillic_ha Cyrillic_HA
-keycode 72 = bracketright braceright Cyrillic_hardsign Cyrillic_HARDSIGN
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A Cyrillic_ef Cyrillic_EF
-keycode 85 = s S Cyrillic_yeru Cyrillic_YERU
-keycode 86 = d D Cyrillic_ve Cyrillic_VE
-keycode 87 = f F Cyrillic_a Cyrillic_A
-keycode 88 = g G Cyrillic_pe Cyrillic_PE
-keycode 89 = h H Cyrillic_er Cyrillic_ER
-keycode 90 = j J Cyrillic_o Cyrillic_O
-keycode 91 = k K Cyrillic_el Cyrillic_EL
-keycode 92 = l L Cyrillic_de Cyrillic_DE
-keycode 93 = semicolon colon Cyrillic_zhe Cyrillic_ZHE
-keycode 94 = apostrophe quotedbl Cyrillic_e Cyrillic_E
-keycode 95 = backslash bar backslash bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z Cyrillic_ya Cyrillic_YA
-keycode 108 = x X Cyrillic_che Cyrillic_CHE
-keycode 109 = c C Cyrillic_es Cyrillic_ES
-keycode 110 = v V Cyrillic_em Cyrillic_EM
-keycode 111 = b B Cyrillic_i Cyrillic_I
-keycode 112 = n N Cyrillic_te Cyrillic_TE
-keycode 113 = m M Cyrillic_softsign Cyrillic_SOFTSIGN
-keycode 114 = comma less Cyrillic_be Cyrillic_BE
-keycode 115 = period greater Cyrillic_yu Cyrillic_YU
-keycode 116 = slash question slash question
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.se b/gkb-new/xmodmap.sun/xmodmap.se
deleted file mode 100644
index e4c7f31d..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.se
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam exclamdown onesuperior
-keycode 38 = 2 quotedbl at twosuperior
-keycode 39 = 3 numbersign sterling threesuperior
-keycode 40 = 4 currency dollar onequarter
-keycode 41 = 5 percent NoSymbol cent
-keycode 42 = 6 ampersand yen
-keycode 43 = 7 slash braceleft division
-keycode 44 = 8 parenleft bracketleft guillemotleft
-keycode 45 = 9 parenright bracketright guillemotright
-keycode 46 = 0 equal braceright degree
-keycode 47 = plus question backslash questiondown
-keycode 48 = dead_acute dead_grave plusminus notsign
-keycode 49 = section onehalf paragraph threequarters
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = w W
-keycode 63 = e E EuroSign cent
-keycode 64 = r R registered
-keycode 65 = t T thorn THORN
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O oe OE
-keycode 70 = p P
-keycode 71 = aring Aring
-keycode 72 = dead_diaeresis dead_circumflex dead_tilde dead_caron
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A ordfeminine masculine
-keycode 85 = s S
-keycode 86 = d D eth ETH
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = odiaeresis Odiaeresis oslash Ooblique
-keycode 94 = adiaeresis Adiaeresis ae AE
-keycode 95 = apostrophe asterisk acute multiply
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z
-keycode 108 = x X
-keycode 109 = c C copyright
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M
-keycode 114 = comma semicolon dead_cedilla dead_ogonek
-keycode 115 = period colon periodcentered dead_abovedot
-keycode 116 = minus underscore hyphen macron
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space space nobreakspace nobreakspace
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.se-type4 b/gkb-new/xmodmap.sun/xmodmap.se-type4
deleted file mode 100644
index fe666065..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.se-type4
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = L1 L1 SunStop
-keycode 9 =
-keycode 10 = L2 L2 SunAgain
-keycode 11 =
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = SunF36
-keycode 17 = F4
-keycode 18 = SunF37
-keycode 19 = F5
-keycode 20 = SunCompose
-keycode 21 = F6
-keycode 22 = asciitilde asciicircum
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 =
-keycode 28 = R1 R1 Pause
-keycode 29 = R2 R2 Print
-keycode 30 = R3 R3 Scroll_Lock Break
-keycode 31 =
-keycode 32 = L3 L3 SunProps
-keycode 33 = L4 L4 SunUndo
-keycode 34 =
-keycode 35 =
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl at
-keycode 39 = 3 numbersign sterling
-keycode 40 = 4 currency dollar
-keycode 41 = 5 percent
-keycode 42 = 6 ampersand
-keycode 43 = 7 slash braceleft
-keycode 44 = 8 parenleft bracketleft
-keycode 45 = 9 parenright bracketright
-keycode 46 = 0 equal braceright
-keycode 47 = plus question backslash
-keycode 48 = SunFA_Acute SunFA_Grave
-keycode 49 = quoteright asterisk quoteleft
-keycode 50 = BackSpace
-keycode 51 =
-keycode 52 = R4 R4 KP_Equal
-keycode 53 = R5 R5 KP_Divide
-keycode 54 = R6 R6 KP_Multiply
-keycode 55 =
-keycode 56 = L5 L5 SunFront
-keycode 57 = Delete Delete KP_Decimal
-keycode 58 = L6 L6 SunCopy
-keycode 59 =
-keycode 60 = Tab
-keycode 61 = Q
-keycode 62 = W
-keycode 63 = e E currency
-keycode 64 = R
-keycode 65 = T
-keycode 66 = Y
-keycode 67 = U
-keycode 68 = I
-keycode 69 = O
-keycode 70 = P
-keycode 71 = Aring
-keycode 72 = SunFA_Diaeresis SunFA_Circum SunFA_Tilde
-keycode 73 = Delete
-keycode 74 = SunAltGraph
-keycode 75 = R7 R7 KP_7 Home
-keycode 76 = Up R8 KP_8
-keycode 77 = R9 R9 KP_9 Prior
-keycode 78 = KP_Subtract
-keycode 79 = L7 L7 SunOpen
-keycode 80 = L8 L8 SunPaste
-keycode 81 =
-keycode 82 =
-keycode 83 = Caps_Lock
-keycode 84 = A
-keycode 85 = S
-keycode 86 = D
-keycode 87 = F
-keycode 88 = G
-keycode 89 = H
-keycode 90 = J
-keycode 91 = K
-keycode 92 = L
-keycode 93 = Odiaeresis
-keycode 94 = Adiaeresis
-keycode 95 = section onehalf
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = Left R10 KP_4
-keycode 99 = R11 R11 KP_5
-keycode 100 = Right R12 KP_6
-keycode 101 = KP_Insert KP_Insert KP_0
-keycode 102 = L9 L9 SunFind
-keycode 103 =
-keycode 104 = L10 L10 SunCut
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = Z
-keycode 108 = X
-keycode 109 = C
-keycode 110 = V
-keycode 111 = B
-keycode 112 = N
-keycode 113 = M
-keycode 114 = comma semicolon
-keycode 115 = period colon
-keycode 116 = minus underscore
-keycode 117 = Shift_R
-keycode 118 = Linefeed
-keycode 119 = R13 R13 KP_1 End
-keycode 120 = Down R14 KP_2
-keycode 121 = R15 R15 KP_3 Next
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Control_L
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 =
-keycode 131 = less greater bar
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.se-usb b/gkb-new/xmodmap.sun/xmodmap.se-usb
deleted file mode 100644
index 91f74de1..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.se-usb
+++ /dev/null
@@ -1,247 +0,0 @@
-keycode 8 =
-keycode 9 =
-keycode 10 =
-keycode 11 = A
-keycode 12 = B
-keycode 13 = C
-keycode 14 = D
-keycode 15 = e E currency
-keycode 16 = F
-keycode 17 = G
-keycode 18 = H
-keycode 19 = I
-keycode 20 = J
-keycode 21 = K
-keycode 22 = L
-keycode 23 = M
-keycode 24 = N
-keycode 25 = O
-keycode 26 = P
-keycode 27 = Q
-keycode 28 = R
-keycode 29 = S
-keycode 30 = T
-keycode 31 = U
-keycode 32 = V
-keycode 33 = W
-keycode 34 = X
-keycode 35 = Y
-keycode 36 = Z
-keycode 37 = 1 exclam
-keycode 38 = 2 quotedbl at
-keycode 39 = 3 numbersign sterling
-keycode 40 = 4 currency dollar
-keycode 41 = 5 percent
-keycode 42 = 6 ampersand
-keycode 43 = 7 slash
-keycode 44 = 8 parenleft bracketleft
-keycode 45 = 9 parenright bracketright
-keycode 46 = 0 equal braceright
-keycode 47 = Return
-keycode 48 = Escape
-keycode 49 = BackSpace
-keycode 50 = Tab
-keycode 51 = space
-keycode 52 = plus question backslash
-keycode 53 = SunFA_Acute SunFA_Grave
-keycode 54 = Aring
-keycode 55 = SunFA_Diaeresis asciicircum asciitilde
-keycode 56 =
-keycode 57 = quoteright asterisk quoteleft
-keycode 58 = Odiaeresis
-keycode 59 = Adiaeresis
-keycode 60 = section onehalf
-keycode 61 = comma semicolon
-keycode 62 = period colon
-keycode 63 = minus underscore
-keycode 64 = Caps_Lock
-keycode 65 = F1
-keycode 66 = F2
-keycode 67 = F3
-keycode 68 = F4
-keycode 69 = F5
-keycode 70 = F6
-keycode 71 = F7
-keycode 72 = F8
-keycode 73 = F9
-keycode 74 = F10
-keycode 75 = SunF36
-keycode 76 = SunF37
-keycode 77 = R2 R2 Print SunSys_Req
-keycode 78 = R3 R3 Scroll_Lock
-keycode 79 = R1 R1 Pause Break
-keycode 80 = Insert
-keycode 81 = Home
-keycode 82 = Prior
-keycode 83 = Delete
-keycode 84 = End
-keycode 85 = Next
-keycode 86 = Right
-keycode 87 = Left
-keycode 88 = Down
-keycode 89 = Up
-keycode 90 = Num_Lock
-keycode 91 = R5 R5 KP_Divide
-keycode 92 = R6 R6 KP_Multiply
-keycode 93 = R4 R4 KP_Subtract
-keycode 94 = KP_Add
-keycode 95 = KP_Enter
-keycode 96 = R13 R13 KP_1 End
-keycode 97 = Down R14 KP_2
-keycode 98 = R15 R15 KP_3 Next
-keycode 99 = Left R10 KP_4
-keycode 100 = R11 R11 KP_5
-keycode 101 = Right R12 KP_6
-keycode 102 = R7 R7 KP_7 Home
-keycode 103 = Up R8 KP_8
-keycode 104 = R9 R9 KP_9 Prior
-keycode 105 = KP_Insert KP_Insert KP_0
-keycode 106 = Delete Delete KP_Separator
-keycode 107 = less greater bar
-keycode 108 = SunCompose
-keycode 109 = SunPowerSwitch SunPowerSwitchShift
-keycode 110 =
-keycode 111 =
-keycode 112 =
-keycode 113 =
-keycode 114 =
-keycode 115 =
-keycode 116 =
-keycode 117 =
-keycode 118 =
-keycode 119 =
-keycode 120 =
-keycode 121 =
-keycode 122 =
-keycode 123 = L7 L7 SunOpen
-keycode 124 = Help
-keycode 125 = L3 L3 SunProps
-keycode 126 = L5 L5 SunFront
-keycode 127 = L1 L1 SunStop
-keycode 128 = L2 L2 SunAgain
-keycode 129 = L4 L4 SunUndo
-keycode 130 = L10 L10 SunCut
-keycode 131 = L6 L6 SunCopy
-keycode 132 = L8 L8 SunPaste
-keycode 133 = L9 L9 SunFind
-keycode 134 = SunAudioMute SunVideoDegauss
-keycode 135 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 136 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 137 =
-keycode 138 =
-keycode 139 =
-keycode 140 =
-keycode 141 =
-keycode 142 =
-keycode 143 =
-keycode 144 =
-keycode 145 =
-keycode 146 =
-keycode 147 =
-keycode 148 =
-keycode 149 =
-keycode 150 =
-keycode 151 =
-keycode 152 =
-keycode 153 =
-keycode 154 =
-keycode 155 =
-keycode 156 =
-keycode 157 =
-keycode 158 =
-keycode 159 =
-keycode 160 =
-keycode 161 =
-keycode 162 =
-keycode 163 =
-keycode 164 =
-keycode 165 =
-keycode 166 =
-keycode 167 =
-keycode 168 =
-keycode 169 =
-keycode 170 =
-keycode 171 =
-keycode 172 =
-keycode 173 =
-keycode 174 =
-keycode 175 =
-keycode 176 =
-keycode 177 =
-keycode 178 =
-keycode 179 =
-keycode 180 =
-keycode 181 =
-keycode 182 =
-keycode 183 =
-keycode 184 =
-keycode 185 =
-keycode 186 =
-keycode 187 =
-keycode 188 =
-keycode 189 =
-keycode 190 =
-keycode 191 =
-keycode 192 =
-keycode 193 =
-keycode 194 =
-keycode 195 =
-keycode 196 =
-keycode 197 =
-keycode 198 =
-keycode 199 =
-keycode 200 =
-keycode 201 =
-keycode 202 =
-keycode 203 =
-keycode 204 =
-keycode 205 =
-keycode 206 =
-keycode 207 =
-keycode 208 =
-keycode 209 =
-keycode 210 =
-keycode 211 =
-keycode 212 =
-keycode 213 =
-keycode 214 =
-keycode 215 =
-keycode 216 =
-keycode 217 =
-keycode 218 =
-keycode 219 =
-keycode 220 =
-keycode 221 =
-keycode 222 =
-keycode 223 =
-keycode 224 =
-keycode 225 =
-keycode 226 =
-keycode 227 =
-keycode 228 =
-keycode 229 =
-keycode 230 =
-keycode 231 = Control_L
-keycode 232 = Shift_L
-keycode 233 = Alt_L
-keycode 234 = Meta_L
-keycode 235 =
-keycode 236 = Shift_R
-keycode 237 = SunAltGraph
-keycode 238 = Meta_R
-keycode 239 =
-keycode 240 =
-keycode 241 =
-keycode 242 =
-keycode 243 =
-keycode 244 =
-keycode 245 =
-keycode 246 =
-keycode 247 =
-keycode 248 =
-keycode 249 =
-keycode 250 =
-keycode 251 =
-keycode 252 =
-keycode 253 =
-keycode 254 =
diff --git a/gkb-new/xmodmap.sun/xmodmap.si b/gkb-new/xmodmap.sun/xmodmap.si
deleted file mode 100644
index 5e7ba48b..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.si
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch Multi_key
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam asciitilde dead_tilde
-keycode 38 = 2 quotedbl dead_caron caron
-keycode 39 = 3 numbersign asciicircum dead_circumflex
-keycode 40 = 4 dollar dead_breve breve
-keycode 41 = 5 percent degree dead_abovering
-keycode 42 = 6 ampersand dead_ogonek ogonek
-keycode 43 = 7 slash grave dead_grave
-keycode 44 = 8 parenleft dead_abovedot abovedot
-keycode 45 = 9 parenright dead_acute apostrophe
-keycode 46 = 0 equal dead_doubleacute doubleacute
-keycode 47 = apostrophe question dead_diaeresis diaeresis
-keycode 48 = plus asterisk dead_cedilla cedilla
-keycode 49 = dead_cedilla dead_diaeresis acute
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q backslash
-keycode 62 = w W bar
-keycode 63 = e E EuroSign
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = z Z
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = scaron Scaron division
-keycode 72 = dstroke Dstroke multiply dead_macron
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S
-keycode 86 = d D
-keycode 87 = f F bracketleft
-keycode 88 = g G bracketright
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K lstroke
-keycode 92 = l L Lstroke
-keycode 93 = ccaron Ccaron
-keycode 94 = cacute Cacute ssharp
-keycode 95 = zcaron Zcaron currency
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = y Y
-keycode 108 = x X
-keycode 109 = c C
-keycode 110 = v V at
-keycode 111 = b B braceleft
-keycode 112 = n N braceright
-keycode 113 = m M section
-keycode 114 = comma semicolon
-keycode 115 = period colon periodcentered
-keycode 116 = minus underscore
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.sk b/gkb-new/xmodmap.sun/xmodmap.sk
deleted file mode 100644
index f332e876..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.sk
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = ISO_Level3_Shift ISO_Level3_Shift
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = plus 1 NoSymbol NoSymbol exclam dead_tilde
-keycode 38 = lacute 2 NoSymbol NoSymbol at dead_caron
-keycode 39 = scaron 3 NoSymbol NoSymbol numbersign dead_circumflex
-keycode 40 = ccaron 4 NoSymbol NoSymbol dollar dead_breve
-keycode 41 = tcaron 5 NoSymbol NoSymbol percent dead_abovering
-keycode 42 = zcaron 6 NoSymbol NoSymbol asciicircum dead_ogonek
-keycode 43 = yacute 7 NoSymbol NoSymbol ampersand dead_grave
-keycode 44 = aacute 8 NoSymbol NoSymbol asterisk dead_abovedot
-keycode 45 = iacute 9 NoSymbol NoSymbol braceleft dead_acute
-keycode 46 = eacute 0 NoSymbol NoSymbol braceright dead_doubleacute
-keycode 47 = equal percent NoSymbol NoSymbol NoSymbol dead_diaeresis
-keycode 48 = dead_acute dead_caron NoSymbol NoSymbol dead_macron dead_cedilla
-keycode 49 = semicolon dead_abovering acute NoSymbol grave asciitilde
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete comma NoSymbol NoSymbol KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q NoSymbol NoSymbol backslash
-keycode 62 = w W NoSymbol NoSymbol bar
-keycode 63 = e E NoSymbol NoSymbol EuroSign
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = z Z
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = uacute slash NoSymbol NoSymbol bracketleft division
-keycode 72 = adiaeresis parenleft NoSymbol NoSymbol bracketright multiply
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A NoSymbol NoSymbol asciitilde
-keycode 85 = s S NoSymbol NoSymbol dstroke
-keycode 86 = d D NoSymbol NoSymbol Dstroke
-keycode 87 = f F NoSymbol NoSymbol bracketleft
-keycode 88 = g G NoSymbol NoSymbol bracketright
-keycode 89 = h H NoSymbol NoSymbol grave
-keycode 90 = j J NoSymbol NoSymbol apostrophe
-keycode 91 = k K NoSymbol NoSymbol lstroke
-keycode 92 = l L NoSymbol NoSymbol Lstroke
-keycode 93 = ocircumflex quotedbl NoSymbol NoSymbol dollar
-keycode 94 = section exclam acute NoSymbol apostrophe ssharp
-keycode 95 = ncaron parenright NoSymbol NoSymbol backslash bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = y Y NoSymbol NoSymbol degree
-keycode 108 = x X NoSymbol NoSymbol numbersign
-keycode 109 = c C NoSymbol NoSymbol ampersand
-keycode 110 = v V NoSymbol NoSymbol at
-keycode 111 = b B NoSymbol NoSymbol braceleft
-keycode 112 = n N NoSymbol NoSymbol braceright
-keycode 113 = m M NoSymbol NoSymbol asciicircum
-keycode 114 = comma question NoSymbol NoSymbol less
-keycode 115 = period colon NoSymbol NoSymbol greater
-keycode 116 = minus underscore NoSymbol NoSymbol asterisk
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space space NoSymbol NoSymbol nobreakspace nobreakspace
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.sr b/gkb-new/xmodmap.sun/xmodmap.sr
deleted file mode 100644
index 27dd5bb7..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.sr
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam 1 exclam
-keycode 38 = 2 at 2 quotedbl
-keycode 39 = 3 numbersign 3 numbersign
-keycode 40 = 4 dollar 4 dollar
-keycode 41 = 5 percent 5 percent
-keycode 42 = 6 asciicircum 6 ampersand
-keycode 43 = 7 ampersand 7 slash
-keycode 44 = 8 asterisk 8 parenleft
-keycode 45 = 9 parenleft 9 parenright
-keycode 46 = 0 parenright 0 equal
-keycode 47 = minus underscore apostrophe question
-keycode 48 = equal plus plus asterisk
-keycode 49 = grave asciitilde grave asciitilde
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q Cyrillic_lje Cyrillic_LJE
-keycode 62 = w W Cyrillic_nje Cyrillic_NJE
-keycode 63 = e E Cyrillic_ie Cyrillic_IE
-keycode 64 = r R Cyrillic_er Cyrillic_ER
-keycode 65 = t T Cyrillic_te Cyrillic_TE
-keycode 66 = y Y Cyrillic_ze Cyrillic_ZE
-keycode 67 = u U Cyrillic_u Cyrillic_U
-keycode 68 = i I Cyrillic_i Cyrillic_I
-keycode 69 = o O Cyrillic_o Cyrillic_O
-keycode 70 = p P Cyrillic_pe Cyrillic_PE
-keycode 71 = bracketleft braceleft Cyrillic_sha Cyrillic_SHA
-keycode 72 = bracketright braceright bracketleft bracketright
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A Cyrillic_a Cyrillic_A
-keycode 85 = s S Cyrillic_es Cyrillic_ES
-keycode 86 = d D Cyrillic_de Cyrillic_DE
-keycode 87 = f F Cyrillic_ef Cyrillic_EF
-keycode 88 = g G Cyrillic_ghe Cyrillic_GHE
-keycode 89 = h H Cyrillic_ha Cyrillic_HA
-keycode 90 = j J Cyrillic_je Cyrillic_JE
-keycode 91 = k K Cyrillic_ka Cyrillic_KA
-keycode 92 = l L Cyrillic_el Cyrillic_EL
-keycode 93 = semicolon colon Cyrillic_che Cyrillic_CHE
-keycode 94 = apostrophe quotedbl Serbian_tshe Serbian_TSHE
-keycode 95 = backslash bar minus underscore
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z Serbian_dje Serbian_DJE
-keycode 108 = x X Cyrillic_dzhe Cyrillic_DZHE
-keycode 109 = c C Cyrillic_tse Cyrillic_TSE
-keycode 110 = v V Cyrillic_zhe Cyrillic_ZHE
-keycode 111 = b B Cyrillic_be Cyrillic_BE
-keycode 112 = n N Cyrillic_en Cyrillic_EN
-keycode 113 = m M Cyrillic_em Cyrillic_EM
-keycode 114 = comma less comma semicolon
-keycode 115 = period greater period colon
-keycode 116 = slash question Cyrillic_zhe Cyrillic_ZHE
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.th b/gkb-new/xmodmap.sun/xmodmap.th
deleted file mode 100644
index d0a5e518..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.th
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam Thai_lakkhangyao plus
-keycode 38 = 2 at slash Thai_leknung
-keycode 39 = 3 numbersign minus Thai_leksong
-keycode 40 = 4 dollar Thai_phosamphao Thai_leksam
-keycode 41 = 5 percent Thai_thothung Thai_leksi
-keycode 42 = 6 asciicircum Thai_sarau Thai_sarauu
-keycode 43 = 7 ampersand Thai_saraue Thai_baht
-keycode 44 = 8 asterisk Thai_khokhwai Thai_lekha
-keycode 45 = 9 parenleft Thai_totao Thai_lekhok
-keycode 46 = 0 parenright Thai_chochan Thai_lekchet
-keycode 47 = minus underscore Thai_khokhai Thai_lekpaet
-keycode 48 = equal plus Thai_chochang Thai_lekkao
-keycode 49 = grave asciitilde underscore percent
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q Thai_maiyamok Thai_leksun
-keycode 62 = w W Thai_saraaimaimalai quotedbl
-keycode 63 = e E Thai_saraam Thai_dochada
-keycode 64 = r R Thai_phophan Thai_thonangmontho
-keycode 65 = t T Thai_saraa Thai_thothong
-keycode 66 = y Y Thai_maihanakat Thai_nikhahit
-keycode 67 = u U Thai_saraii Thai_maitri
-keycode 68 = i I Thai_rorua Thai_nonen
-keycode 69 = o O Thai_nonu Thai_paiyannoi
-keycode 70 = p P Thai_yoyak Thai_yoying
-keycode 71 = bracketleft braceleft Thai_bobaimai Thai_thothan
-keycode 72 = bracketright braceright Thai_loling comma
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A Thai_fofan Thai_ru
-keycode 85 = s S Thai_hohip Thai_khorakhang
-keycode 86 = d D Thai_kokai Thai_topatak
-keycode 87 = f F Thai_dodek Thai_sarao
-keycode 88 = g G Thai_sarae Thai_chochoe
-keycode 89 = h H Thai_maitho Thai_maitaikhu
-keycode 90 = j J Thai_maiek Thai_maichattawa
-keycode 91 = k K Thai_saraaa Thai_sorusi
-keycode 92 = l L Thai_sosua Thai_sosala
-keycode 93 = semicolon colon Thai_wowaen Thai_soso
-keycode 94 = apostrophe quotedbl Thai_ngongu period
-keycode 95 = backslash bar Thai_khokhuat Thai_khokhon
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L ISO_First_Group
-keycode 107 = z Z Thai_phophung parenleft
-keycode 108 = x X Thai_popla parenright
-keycode 109 = c C Thai_saraae Thai_choching
-keycode 110 = v V Thai_oang Thai_honokhuk
-keycode 111 = b B Thai_sarai Thai_phinthu
-keycode 112 = n N Thai_sarauee Thai_thanthakhat
-keycode 113 = m M Thai_thothahan question
-keycode 114 = comma less Thai_moma Thai_thophuthao
-keycode 115 = period greater Thai_saraaimaimuan Thai_lochula
-keycode 116 = slash question Thai_fofa Thai_lu
-keycode 117 = Shift_R ISO_Last_Group
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.tr b/gkb-new/xmodmap.sun/xmodmap.tr
deleted file mode 100644
index 8f5b1ad8..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.tr
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch Multi_key
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 apostrophe twosuperior
-keycode 39 = 3 asciicircum numbersign
-keycode 40 = 4 plus dollar
-keycode 41 = 5 percent onehalf
-keycode 42 = 6 ampersand threequarters
-keycode 43 = 7 slash braceleft
-keycode 44 = 8 parenleft bracketleft
-keycode 45 = 9 parenright bracketright plusminus
-keycode 46 = 0 equal braceright degree
-keycode 47 = asterisk question backslash questiondown
-keycode 48 = minus underscore
-keycode 49 = quotedbl eacute notsign
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Separator
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q at
-keycode 62 = w W
-keycode 63 = e E EuroSign
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = yacute I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = eth ETH dead_diaeresis
-keycode 72 = udiaeresis Udiaeresis asciitilde dead_macron
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = thorn THORN acute
-keycode 94 = i Yacute dead_circumflex
-keycode 95 = comma semicolon grave
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z
-keycode 108 = x X
-keycode 109 = c C
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M mu
-keycode 114 = odiaeresis Odiaeresis
-keycode 115 = ccedilla Ccedilla periodcentered division
-keycode 116 = period colon slash
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.ua b/gkb-new/xmodmap.sun/xmodmap.ua
deleted file mode 100644
index 5108850d..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.ua
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam 1 exclam
-keycode 38 = 2 at 2 quotedbl
-keycode 39 = 3 numbersign 3 apostrophe
-keycode 40 = 4 dollar 4 asterisk
-keycode 41 = 5 percent 5 colon
-keycode 42 = 6 asciicircum 6 comma
-keycode 43 = 7 ampersand 7 period
-keycode 44 = 8 asterisk 8 semicolon
-keycode 45 = 9 parenleft 9 parenleft
-keycode 46 = 0 parenright 0 parenright
-keycode 47 = minus underscore minus underscore
-keycode 48 = equal plus equal plus
-keycode 49 = grave asciitilde Ukrainian_ghe_with_upturn Ukrainian_GHE_WITH_UPTURN
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q Cyrillic_shorti Cyrillic_SHORTI
-keycode 62 = w W Cyrillic_tse Cyrillic_TSE
-keycode 63 = e E Cyrillic_u Cyrillic_U
-keycode 64 = r R Cyrillic_ka Cyrillic_KA
-keycode 65 = t T Cyrillic_ie Cyrillic_IE
-keycode 66 = y Y Cyrillic_en Cyrillic_EN
-keycode 67 = u U Cyrillic_ghe Cyrillic_GHE
-keycode 68 = i I Cyrillic_sha Cyrillic_SHA
-keycode 69 = o O Cyrillic_shcha Cyrillic_SHCHA
-keycode 70 = p P Cyrillic_ze Cyrillic_ZE
-keycode 71 = bracketleft braceleft Cyrillic_ha Cyrillic_HA
-keycode 72 = bracketright braceright Ukrainian_yi Ukrainian_YI
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A Cyrillic_ef Cyrillic_EF
-keycode 85 = s S Ukrainian_i Ukrainian_I
-keycode 86 = d D Cyrillic_ve Cyrillic_VE
-keycode 87 = f F Cyrillic_a Cyrillic_A
-keycode 88 = g G Cyrillic_pe Cyrillic_PE
-keycode 89 = h H Cyrillic_er Cyrillic_ER
-keycode 90 = j J Cyrillic_o Cyrillic_O
-keycode 91 = k K Cyrillic_el Cyrillic_EL
-keycode 92 = l L Cyrillic_de Cyrillic_DE
-keycode 93 = semicolon colon Cyrillic_zhe Cyrillic_ZHE
-keycode 94 = apostrophe quotedbl Ukrainian_ie Ukrainian_IE
-keycode 95 = backslash bar backslash bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z Cyrillic_ya Cyrillic_YA
-keycode 108 = x X Cyrillic_che Cyrillic_CHE
-keycode 109 = c C Cyrillic_es Cyrillic_ES
-keycode 110 = v V Cyrillic_em Cyrillic_EM
-keycode 111 = b B Cyrillic_i Cyrillic_I
-keycode 112 = n N Cyrillic_te Cyrillic_TE
-keycode 113 = m M Cyrillic_softsign Cyrillic_SOFTSIGN
-keycode 114 = comma less Cyrillic_be Cyrillic_BE
-keycode 115 = period greater Cyrillic_yu Cyrillic_YU
-keycode 116 = slash question slash question
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.us b/gkb-new/xmodmap.sun/xmodmap.us
deleted file mode 100644
index 741ff45f..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.us
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 at
-keycode 39 = 3 numbersign
-keycode 40 = 4 dollar
-keycode 41 = 5 percent
-keycode 42 = 6 asciicircum
-keycode 43 = 7 ampersand
-keycode 44 = 8 asterisk
-keycode 45 = 9 parenleft
-keycode 46 = 0 parenright
-keycode 47 = minus underscore
-keycode 48 = equal plus
-keycode 49 = grave asciitilde acute
-keycode 50 = BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab
-keycode 61 = q Q
-keycode 62 = w W
-keycode 63 = e E
-keycode 64 = r R
-keycode 65 = t T
-keycode 66 = y Y
-keycode 67 = u U
-keycode 68 = i I
-keycode 69 = o O
-keycode 70 = p P
-keycode 71 = bracketleft braceleft
-keycode 72 = bracketright braceright
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = a A
-keycode 85 = s S
-keycode 86 = d D
-keycode 87 = f F
-keycode 88 = g G
-keycode 89 = h H
-keycode 90 = j J
-keycode 91 = k K
-keycode 92 = l L
-keycode 93 = semicolon colon
-keycode 94 = apostrophe quotedbl acute
-keycode 95 = backslash bar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = z Z
-keycode 108 = x X
-keycode 109 = c C
-keycode 110 = v V
-keycode 111 = b B
-keycode 112 = n N
-keycode 113 = m M
-keycode 114 = comma less
-keycode 115 = period greater
-keycode 116 = slash question
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.us-type4 b/gkb-new/xmodmap.sun/xmodmap.us-type4
deleted file mode 100644
index 45611225..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.us-type4
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = L1 L1 SunStop
-keycode 9 =
-keycode 10 = L2 L2 SunAgain
-keycode 11 =
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = SunF36
-keycode 17 = F4
-keycode 18 = SunF37
-keycode 19 = F5
-keycode 20 = SunAltGraph
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 =
-keycode 28 = R1 R1 Pause
-keycode 29 = R2 R2 Print
-keycode 30 = R3 R3 Scroll_Lock Break
-keycode 31 =
-keycode 32 = L3 L3 SunProps
-keycode 33 = L4 L4 SunUndo
-keycode 34 =
-keycode 35 =
-keycode 36 = Escape
-keycode 37 = 1 exclam
-keycode 38 = 2 at
-keycode 39 = 3 numbersign
-keycode 40 = 4 dollar currency
-keycode 41 = 5 percent currency
-keycode 42 = 6 asciicircum
-keycode 43 = 7 ampersand
-keycode 44 = 8 asterisk
-keycode 45 = 9 parenleft
-keycode 46 = 0 parenright
-keycode 47 = minus underscore
-keycode 48 = equal plus
-keycode 49 = quoteleft asciitilde
-keycode 50 = BackSpace
-keycode 51 =
-keycode 52 = R4 R4 KP_Equal
-keycode 53 = R5 R5 KP_Divide
-keycode 54 = R6 R6 KP_Multiply
-keycode 55 =
-keycode 56 = L5 L5 SunFront
-keycode 57 = Delete Delete KP_Decimal
-keycode 58 = L6 L6 SunCopy
-keycode 59 =
-keycode 60 = Tab
-keycode 61 = Q
-keycode 62 = W
-keycode 63 = e E currency
-keycode 64 = R
-keycode 65 = T
-keycode 66 = Y
-keycode 67 = U
-keycode 68 = I
-keycode 69 = O
-keycode 70 = P
-keycode 71 = bracketleft braceleft
-keycode 72 = bracketright braceright
-keycode 73 = Delete
-keycode 74 = SunCompose
-keycode 75 = R7 R7 KP_7 Home
-keycode 76 = Up R8 KP_8
-keycode 77 = R9 R9 KP_9 Prior
-keycode 78 = KP_Subtract
-keycode 79 = L7 L7 SunOpen
-keycode 80 = L8 L8 SunPaste
-keycode 81 =
-keycode 82 =
-keycode 83 = Control_L
-keycode 84 = A
-keycode 85 = S
-keycode 86 = D
-keycode 87 = F
-keycode 88 = G
-keycode 89 = H
-keycode 90 = J
-keycode 91 = K
-keycode 92 = L
-keycode 93 = semicolon colon
-keycode 94 = quoteright quotedbl
-keycode 95 = backslash bar brokenbar
-keycode 96 = Return
-keycode 97 = KP_Enter
-keycode 98 = Left R10 KP_4
-keycode 99 = R11 R11 KP_5
-keycode 100 = Right R12 KP_6
-keycode 101 = KP_Insert KP_Insert KP_0
-keycode 102 = L9 L9 SunFind
-keycode 103 =
-keycode 104 = L10 L10 SunCut
-keycode 105 = Num_Lock
-keycode 106 = Shift_L
-keycode 107 = Z
-keycode 108 = X
-keycode 109 = C
-keycode 110 = V
-keycode 111 = B
-keycode 112 = N
-keycode 113 = M
-keycode 114 = comma less
-keycode 115 = period greater
-keycode 116 = slash question
-keycode 117 = Shift_R
-keycode 118 = Linefeed
-keycode 119 = R13 R13 KP_1 End
-keycode 120 = Down R14 KP_2
-keycode 121 = R15 R15 KP_3 Next
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Caps_Lock
-keycode 127 = Meta_L
-keycode 128 = space
-keycode 129 = Meta_R
-keycode 130 =
-keycode 131 =
-keycode 132 = KP_Add
diff --git a/gkb-new/xmodmap.sun/xmodmap.us-type6 b/gkb-new/xmodmap.sun/xmodmap.us-type6
deleted file mode 100644
index 7eaf6f2c..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.us-type6
+++ /dev/null
@@ -1,122 +0,0 @@
-#############################################################
-# Xmodmap file for Hungarian layout on Sun Ray thin clients #
-# #
-# created by Janos Cserep <[email protected]> #
-# #
-#############################################################
-
-keycode 124 = Help
-keycode 48 = Escape
-keycode 65 = F1
-keycode 66 = F2
-keycode 67 = F3
-keycode 68 = F4
-keycode 69 = F5
-keycode 70 = F6
-keycode 71 = F7
-keycode 72 = F8
-keycode 73 = F9
-keycode 74 = F10
-keycode 75 = SunF36
-keycode 76 = SunF37
-keycode 77 = R2 R2 Print SunSys_Req
-keycode 78 = R3 R3 Scroll_Lock
-keycode 79 = R1 R1 Pause Break
-keycode 127 = L1 L1 SunStop
-keycode 128 = L2 L2 SunAgain
-keycode 60 = 0 section
-keycode 37 = 1 quoteright asciitilde
-keycode 38 = 2 quotedbl
-keycode 39 = 3 plus asciicircum
-keycode 40 = 4 exclam
-keycode 41 = 5 percent degree
-keycode 42 = 6 slash
-keycode 43 = 7 equal quoteleft
-keycode 44 = 8 parenleft
-keycode 45 = 9 parenright acute
-keycode 46 = odiaeresis Odiaeresis doubleacute
-keycode 52 = udiaeresis Udiaeresis diaeresis
-keycode 53 = oacute Oacute asciitilde
-keycode 49 = BackSpace
-keycode 80 = Insert
-keycode 81 = Home
-keycode 82 = Prior
-keycode 90 = Num_Lock
-keycode 91 = R5 R5 KP_Divide
-keycode 92 = R6 R6 KP_Multiply
-keycode 93 = R4 R4 KP_Subtract
-keycode 125 = L3 L3 SunProps
-keycode 129 = L4 L4 SunUndo
-keycode 50 = Tab
-keycode 27 = q Q backslash
-keycode 33 = w W bar
-keycode 15 = E
-keycode 28 = R
-keycode 30 = T
-keycode 35 = Z
-keycode 31 = u U EuroSign
-keycode 19 = I
-keycode 25 = O
-keycode 26 = P
-keycode 54 = odoubleacute Odoubleacute division
-keycode 55 = uacute Uacute multiply
-keycode 83 = Delete
-keycode 84 = End
-keycode 85 = Next
-keycode 102 = R7 R7 KP_7 Home
-keycode 103 = Up R8 KP_8
-keycode 104 = R9 R9 KP_9 Prior
-keycode 94 = KP_Add
-keycode 126 = L5 L5 SunFront
-keycode 131 = L6 L6 SunCopy
-keycode 64 = Caps_Lock
-keycode 11 = A
-keycode 29 = s S dstroke
-keycode 14 = d D Dstroke
-keycode 16 = f F bracketleft
-keycode 17 = g G bracketright
-keycode 18 = H
-keycode 20 = j J iacute
-keycode 21 = k K
-keycode 22 = L
-keycode 58 = eacute Eacute dollar
-keycode 59 = aacute Aacute ssharp
-keycode 56 = udoubleacute Udoubleacute backslash
-keycode 47 = Return
-keycode 99 = Left R10 KP_4
-keycode 100 = R11 R11 KP_5
-keycode 101 = Right R12 KP_6
-keycode 123 = L7 L7 SunOpen
-keycode 132 = L8 L8 SunPaste
-keycode 232 = Shift_L
-keycode 107 = iacute Iacute less
-keycode 36 = y Y greater
-keycode 34 = x X numbersign
-keycode 13 = c C ampersand
-keycode 32 = v V at
-keycode 12 = b B braceleft
-keycode 24 = n N braceright
-keycode 23 = M
-keycode 61 = comma question semicolon
-keycode 62 = period colon
-keycode 63 = minus underscore asterisk
-keycode 236 = Shift_R
-keycode 89 = Up
-keycode 96 = R13 R13 KP_1 End
-keycode 97 = Down R14 KP_2
-keycode 98 = R15 R15 KP_3 Next
-keycode 95 = KP_Enter
-keycode 133 = L9 L9 SunFind
-keycode 130 = L10 L10 SunCut
-keycode 231 = Control_L
-keycode 233 = Alt_L
-keycode 234 = Meta_L
-keycode 51 = space
-keycode 238 = Meta_R
-keycode 108 = SunCompose
-keycode 237 = SunAltGraph
-keycode 87 = Left
-keycode 88 = Down
-keycode 86 = Right
-keycode 105 = KP_Insert KP_Insert KP_0
-keycode 106 = Delete Delete KP_Decimal
diff --git a/gkb-new/xmodmap.sun/xmodmap.us-usb b/gkb-new/xmodmap.sun/xmodmap.us-usb
deleted file mode 100644
index c430b9cd..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.us-usb
+++ /dev/null
@@ -1,247 +0,0 @@
-keycode 8 =
-keycode 9 =
-keycode 10 =
-keycode 11 = A
-keycode 12 = B
-keycode 13 = C
-keycode 14 = D
-keycode 15 = e E currency
-keycode 16 = F
-keycode 17 = G
-keycode 18 = H
-keycode 19 = I
-keycode 20 = J
-keycode 21 = K
-keycode 22 = L
-keycode 23 = M
-keycode 24 = N
-keycode 25 = O
-keycode 26 = P
-keycode 27 = Q
-keycode 28 = R
-keycode 29 = S
-keycode 30 = T
-keycode 31 = U
-keycode 32 = V
-keycode 33 = W
-keycode 34 = X
-keycode 35 = Y
-keycode 36 = Z
-keycode 37 = 1 exclam
-keycode 38 = 2 at
-keycode 39 = 3 numbersign
-keycode 40 = 4 dollar currency
-keycode 41 = 5 percent currency
-keycode 42 = 6 asciicircum
-keycode 43 = 7 ampersand
-keycode 44 = 8 asterisk
-keycode 45 = 9 parenleft
-keycode 46 = 0 parenright
-keycode 47 = Return
-keycode 48 = Escape
-keycode 49 = BackSpace
-keycode 50 = Tab
-keycode 51 = space
-keycode 52 = minus underscore
-keycode 53 = equal plus
-keycode 54 = bracketleft braceleft
-keycode 55 = bracketright braceright
-keycode 56 = backslash bar brokenbar
-keycode 57 =
-keycode 58 = semicolon colon
-keycode 59 = quoteright quotedbl
-keycode 60 = quoteleft asciitilde
-keycode 61 = comma less
-keycode 62 = period greater
-keycode 63 = slash question
-keycode 64 = Caps_Lock
-keycode 65 = F1
-keycode 66 = F2
-keycode 67 = F3
-keycode 68 = F4
-keycode 69 = F5
-keycode 70 = F6
-keycode 71 = F7
-keycode 72 = F8
-keycode 73 = F9
-keycode 74 = F10
-keycode 75 = SunF36
-keycode 76 = SunF37
-keycode 77 = R2 R2 Print SunSys_Req
-keycode 78 = R3 R3 Scroll_Lock
-keycode 79 = R1 R1 Pause Break
-keycode 80 = Insert
-keycode 81 = Home
-keycode 82 = Prior
-keycode 83 = Delete
-keycode 84 = End
-keycode 85 = Next
-keycode 86 = Right
-keycode 87 = Left
-keycode 88 = Down
-keycode 89 = Up
-keycode 90 = Num_Lock
-keycode 91 = R5 R5 KP_Divide
-keycode 92 = R6 R6 KP_Multiply
-keycode 93 = R4 R4 KP_Subtract
-keycode 94 = KP_Add
-keycode 95 = KP_Enter
-keycode 96 = R13 R13 KP_1 End
-keycode 97 = Down R14 KP_2
-keycode 98 = R15 R15 KP_3 Next
-keycode 99 = Left R10 KP_4
-keycode 100 = R11 R11 KP_5
-keycode 101 = Right R12 KP_6
-keycode 102 = R7 R7 KP_7 Home
-keycode 103 = Up R8 KP_8
-keycode 104 = R9 R9 KP_9 Prior
-keycode 105 = KP_Insert KP_Insert KP_0
-keycode 106 = Delete Delete KP_Decimal
-keycode 107 =
-keycode 108 = SunCompose
-keycode 109 = SunPowerSwitch SunPowerSwitchShift
-keycode 110 =
-keycode 111 =
-keycode 112 =
-keycode 113 =
-keycode 114 =
-keycode 115 =
-keycode 116 =
-keycode 117 =
-keycode 118 =
-keycode 119 =
-keycode 120 =
-keycode 121 =
-keycode 122 =
-keycode 123 = L7 L7 SunOpen
-keycode 124 = Help
-keycode 125 = L3 L3 SunProps
-keycode 126 = L5 L5 SunFront
-keycode 127 = L1 L1 SunStop
-keycode 128 = L2 L2 SunAgain
-keycode 129 = L4 L4 SunUndo
-keycode 130 = L10 L10 SunCut
-keycode 131 = L6 L6 SunCopy
-keycode 132 = L8 L8 SunPaste
-keycode 133 = L9 L9 SunFind
-keycode 134 = SunAudioMute SunVideoDegauss
-keycode 135 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 136 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 137 =
-keycode 138 =
-keycode 139 =
-keycode 140 =
-keycode 141 =
-keycode 142 =
-keycode 143 =
-keycode 144 =
-keycode 145 =
-keycode 146 =
-keycode 147 =
-keycode 148 =
-keycode 149 =
-keycode 150 =
-keycode 151 =
-keycode 152 =
-keycode 153 =
-keycode 154 =
-keycode 155 =
-keycode 156 =
-keycode 157 =
-keycode 158 =
-keycode 159 =
-keycode 160 =
-keycode 161 =
-keycode 162 =
-keycode 163 =
-keycode 164 =
-keycode 165 =
-keycode 166 =
-keycode 167 =
-keycode 168 =
-keycode 169 =
-keycode 170 =
-keycode 171 =
-keycode 172 =
-keycode 173 =
-keycode 174 =
-keycode 175 =
-keycode 176 =
-keycode 177 =
-keycode 178 =
-keycode 179 =
-keycode 180 =
-keycode 181 =
-keycode 182 =
-keycode 183 =
-keycode 184 =
-keycode 185 =
-keycode 186 =
-keycode 187 =
-keycode 188 =
-keycode 189 =
-keycode 190 =
-keycode 191 =
-keycode 192 =
-keycode 193 =
-keycode 194 =
-keycode 195 =
-keycode 196 =
-keycode 197 =
-keycode 198 =
-keycode 199 =
-keycode 200 =
-keycode 201 =
-keycode 202 =
-keycode 203 =
-keycode 204 =
-keycode 205 =
-keycode 206 =
-keycode 207 =
-keycode 208 =
-keycode 209 =
-keycode 210 =
-keycode 211 =
-keycode 212 =
-keycode 213 =
-keycode 214 =
-keycode 215 =
-keycode 216 =
-keycode 217 =
-keycode 218 =
-keycode 219 =
-keycode 220 =
-keycode 221 =
-keycode 222 =
-keycode 223 =
-keycode 224 =
-keycode 225 =
-keycode 226 =
-keycode 227 =
-keycode 228 =
-keycode 229 =
-keycode 230 =
-keycode 231 = Control_L
-keycode 232 = Shift_L
-keycode 233 = Alt_L
-keycode 234 = Meta_L
-keycode 235 = Control_R
-keycode 236 = Shift_R
-keycode 237 = SunAltGraph
-keycode 238 = Meta_R
-keycode 239 =
-keycode 240 =
-keycode 241 =
-keycode 242 =
-keycode 243 =
-keycode 244 =
-keycode 245 =
-keycode 246 =
-keycode 247 =
-keycode 248 =
-keycode 249 =
-keycode 250 =
-keycode 251 =
-keycode 252 =
-keycode 253 =
-keycode 254 =
diff --git a/gkb-new/xmodmap.sun/xmodmap.vn b/gkb-new/xmodmap.sun/xmodmap.vn
deleted file mode 100644
index 0348222c..00000000
--- a/gkb-new/xmodmap.sun/xmodmap.vn
+++ /dev/null
@@ -1,125 +0,0 @@
-keycode 8 = Cancel NoSymbol F11
-keycode 9 = SunAudioLowerVolume SunVideoLowerBrightness
-keycode 10 = Redo NoSymbol F12
-keycode 11 = SunAudioRaiseVolume SunVideoRaiseBrightness
-keycode 12 = F1
-keycode 13 = F2
-keycode 14 = F10
-keycode 15 = F3
-keycode 16 = F11 NoSymbol SunF36
-keycode 17 = F4
-keycode 18 = F12 NoSymbol SunF37
-keycode 19 = F5
-keycode 20 = Mode_switch
-keycode 21 = F6
-keycode 22 =
-keycode 23 = F7
-keycode 24 = F8
-keycode 25 = F9
-keycode 26 = Alt_L
-keycode 27 = Up
-keycode 28 = Pause NoSymbol Break
-keycode 29 = Print NoSymbol Sys_Req SunSys_Req
-keycode 30 = Scroll_Lock
-keycode 31 = Left
-keycode 32 = SunProps NoSymbol F13
-keycode 33 = Undo NoSymbol F14
-keycode 34 = Down
-keycode 35 = Right
-keycode 36 = Escape
-keycode 37 = 1 exclam abreve Abreve
-keycode 38 = 2 at acircumflex Acircumflex
-keycode 39 = 3 numbersign ecircumflex Ecircumflex
-keycode 40 = 4 dollar ocircumflex Ocircumflex
-keycode 41 = 5 percent dead_grave percent
-keycode 42 = 6 asciicircum dead_hook asciicircum
-keycode 43 = 7 ampersand dead_tilde ampersand
-keycode 44 = 8 asterisk dead_acute asterisk
-keycode 45 = 9 parenleft dead_belowdot parenleft
-keycode 46 = 0 parenright dstroke Dstroke
-keycode 47 = minus underscore minus underscore
-keycode 48 = equal plus equal plus
-keycode 49 = grave asciitilde grave asciitilde
-keycode 50 = BackSpace NoSymbol BackSpace
-keycode 51 = Insert
-keycode 52 = SunAudioMute SunVideoDegauss
-keycode 53 = KP_Divide NoSymbol F25
-keycode 54 = KP_Multiply NoSymbol F26
-keycode 55 = SunPowerSwitch SunPowerSwitchShift
-keycode 56 = SunFront NoSymbol F15
-keycode 57 = KP_Delete KP_Decimal
-keycode 58 = SunCopy NoSymbol F16
-keycode 59 = Home
-keycode 60 = Tab ISO_Left_Tab Tab ISO_Left_Tab
-keycode 61 = q Q q Q
-keycode 62 = w W w W
-keycode 63 = e E e E
-keycode 64 = r R r R
-keycode 65 = t T t T
-keycode 66 = y Y y Y
-keycode 67 = u U u U
-keycode 68 = i I i I
-keycode 69 = o O o O
-keycode 70 = p P p P
-keycode 71 = bracketleft braceleft uhorn Uhorn
-keycode 72 = bracketright braceright ohorn Ohorn
-keycode 73 = Delete
-keycode 74 = Multi_key
-keycode 75 = KP_Home KP_7 F27
-keycode 76 = KP_Up KP_8 F28
-keycode 77 = KP_Prior KP_9 F29
-keycode 78 = KP_Subtract
-keycode 79 = SunOpen NoSymbol F17
-keycode 80 = SunPaste NoSymbol F18
-keycode 81 = End
-keycode 82 =
-keycode 83 = Control_L NoSymbol Control_L
-keycode 84 = a A a A
-keycode 85 = s S s S
-keycode 86 = d D d D
-keycode 87 = f F f F
-keycode 88 = g G g G
-keycode 89 = h H h H
-keycode 90 = j J j J
-keycode 91 = k K k K
-keycode 92 = l L l L
-keycode 93 = semicolon colon semicolon colon
-keycode 94 = apostrophe quotedbl apostrophe quotedbl
-keycode 95 = backslash bar backslash bar
-keycode 96 = Return NoSymbol Return
-keycode 97 = KP_Enter
-keycode 98 = KP_Left KP_4 F30
-keycode 99 = KP_Begin KP_5 F31
-keycode 100 = KP_Right KP_6 F32
-keycode 101 = KP_Insert KP_0
-keycode 102 = Find NoSymbol F19
-keycode 103 = Prior
-keycode 104 = SunCut NoSymbol F20
-keycode 105 = Num_Lock
-keycode 106 = Shift_L NoSymbol Shift_L
-keycode 107 = z Z z Z
-keycode 108 = x X x X
-keycode 109 = c C c C
-keycode 110 = v V v V
-keycode 111 = b B b B
-keycode 112 = n N n N
-keycode 113 = m M m M
-keycode 114 = comma less comma less
-keycode 115 = period greater period greater
-keycode 116 = slash question slash question
-keycode 117 = Shift_R
-keycode 118 =
-keycode 119 = KP_End KP_1 F33
-keycode 120 = KP_Down KP_2 F34
-keycode 121 = KP_Next KP_3 F35
-keycode 122 =
-keycode 123 =
-keycode 124 =
-keycode 125 = Help
-keycode 126 = Control_L ISO_Next_Group
-keycode 127 = Meta_L
-keycode 128 = space NoSymbol space
-keycode 129 = Meta_R
-keycode 130 = Next
-keycode 131 =
-keycode 132 = KP_Add