diff --git a/Pocket__Setting_up_overlayFS_on_Raspberry_Pi.pdf b/Pocket__Setting_up_overlayFS_on_Raspberry_Pi.pdf
deleted file mode 100644
index e651b43..0000000
Binary files a/Pocket__Setting_up_overlayFS_on_Raspberry_Pi.pdf and /dev/null differ
diff --git a/backup.sh b/backup.sh
index 4197e39..f0b1b2b 100755
--- a/backup.sh
+++ b/backup.sh
@@ -6,17 +6,19 @@
#Important: not tested!
set -e
DEV=$1
-COUNT=1
+#count changed for EFS Partition
+COUNT=2
if [[ $(which test > /dev/null) == true ]]; then
echo "Do yoe need test for this script!"
exit 1
fi
-if [[ $USERNAME != root ]]; then
- echo "You have no root access. Please logon as root and retry!"
- exit 1
-fi
+#root check commented. make problems
+#if [[ $USERNAME != root ]]; then
+# echo "You have no root access. Please logon as root and retry!"
+# exit 1
+#fi
if [[ $# -eq 0 ]]; then
echo "Please add the SDCard Device the command line to restore the SDCard!"
@@ -37,6 +39,9 @@ mkdir backup
mkdir mnt
sfdisk -d $DEV > $PWD/backup/partitiontables
+#backup boot partitions / fitst 512Bytes
+dd if=$DEV of=$PWD/backup/boot.part.img bs=512 count=1
+
while [[ $COUNT -lt 3 ]]; do
if [ ! -b $DEV$COUNT ]; then
DEV=$DEV"p"
diff --git a/etc_org.acl b/etc_org.acl
deleted file mode 100644
index a73e826..0000000
--- a/etc_org.acl
+++ /dev/null
@@ -1,7 +0,0 @@
-# file: ../etc_org
-# owner: root
-# group: root
-user::rwx
-group::r-x
-other::r-x
-
diff --git a/etc_org/.java/.systemPrefs/.system.lock b/etc_org/.java/.systemPrefs/.system.lock
deleted file mode 100644
index e69de29..0000000
diff --git a/etc_org/.java/.systemPrefs/.systemRootModFile b/etc_org/.java/.systemPrefs/.systemRootModFile
deleted file mode 100644
index e69de29..0000000
diff --git a/etc_org/.pwd.lock b/etc_org/.pwd.lock
deleted file mode 100644
index e69de29..0000000
diff --git a/etc_org/ImageMagick-6/coder.xml b/etc_org/ImageMagick-6/coder.xml
deleted file mode 100644
index 5c62cb4..0000000
--- a/etc_org/ImageMagick-6/coder.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-]>
-
-
-
-
-
-
diff --git a/etc_org/ImageMagick-6/colors.xml b/etc_org/ImageMagick-6/colors.xml
deleted file mode 100644
index 55bfb5d..0000000
--- a/etc_org/ImageMagick-6/colors.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-]>
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/etc_org/ImageMagick-6/delegates.xml b/etc_org/ImageMagick-6/delegates.xml
deleted file mode 100644
index c17c6df..0000000
--- a/etc_org/ImageMagick-6/delegates.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-]>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/etc_org/ImageMagick-6/log.xml b/etc_org/ImageMagick-6/log.xml
deleted file mode 100644
index cdacdab..0000000
--- a/etc_org/ImageMagick-6/log.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
-]>
-
-
-
-
-
-
-
-
-
diff --git a/etc_org/ImageMagick-6/magic.xml b/etc_org/ImageMagick-6/magic.xml
deleted file mode 100644
index 7f17731..0000000
--- a/etc_org/ImageMagick-6/magic.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-]>
-
-
-
-
-
-
-
diff --git a/etc_org/ImageMagick-6/mime.xml b/etc_org/ImageMagick-6/mime.xml
deleted file mode 100644
index c1b61f4..0000000
--- a/etc_org/ImageMagick-6/mime.xml
+++ /dev/null
@@ -1,1142 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-]>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/etc_org/ImageMagick-6/policy.xml b/etc_org/ImageMagick-6/policy.xml
deleted file mode 100644
index fbca757..0000000
--- a/etc_org/ImageMagick-6/policy.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
-
-
-
-
-]>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/etc_org/ImageMagick-6/quantization-table.xml b/etc_org/ImageMagick-6/quantization-table.xml
deleted file mode 100644
index a05552b..0000000
--- a/etc_org/ImageMagick-6/quantization-table.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
-
-]>
-
-
-
- Luma Quantization Table
-
- 16, 16, 16, 18, 25, 37, 56, 85,
- 16, 17, 20, 27, 34, 40, 53, 75,
- 16, 20, 24, 31, 43, 62, 91, 135,
- 18, 27, 31, 40, 53, 74, 106, 156,
- 25, 34, 43, 53, 69, 94, 131, 189,
- 37, 40, 62, 74, 94, 124, 169, 238,
- 56, 53, 91, 106, 131, 169, 226, 311,
- 85, 75, 135, 156, 189, 238, 311, 418
-
-
-
-
-
diff --git a/etc_org/ImageMagick-6/thresholds.xml b/etc_org/ImageMagick-6/thresholds.xml
deleted file mode 100644
index 2ca2dab..0000000
--- a/etc_org/ImageMagick-6/thresholds.xml
+++ /dev/null
@@ -1,334 +0,0 @@
-
-
-
-
-
-
-
-
-
-]>
-
-
-
-
-
- Threshold 1x1 (non-dither)
-
- 1
-
-
-
-
- Checkerboard 2x1 (dither)
-
- 1 2
- 2 1
-
-
-
-
-
- Ordered 2x2 (dispersed)
-
- 1 3
- 4 2
-
-
-
-
- Ordered 3x3 (dispersed)
-
- 3 7 4
- 6 1 9
- 2 8 5
-
-
-
-
-
- Ordered 4x4 (dispersed)
-
- 1 9 3 11
- 13 5 15 7
- 4 12 2 10
- 16 8 14 6
-
-
-
-
-
- Ordered 8x8 (dispersed)
-
- 1 49 13 61 4 52 16 64
- 33 17 45 29 36 20 48 32
- 9 57 5 53 12 60 8 56
- 41 25 37 21 44 28 40 24
- 3 51 15 63 2 50 14 62
- 35 19 47 31 34 18 46 30
- 11 59 7 55 10 58 6 54
- 43 27 39 23 42 26 38 22
-
-
-
-
-
- Halftone 4x4 (angled)
-
- 4 2 7 5
- 3 1 8 6
- 7 5 4 2
- 8 6 3 1
-
-
-
-
- Halftone 6x6 (angled)
-
- 14 13 10 8 2 3
- 16 18 12 7 1 4
- 15 17 11 9 6 5
- 8 2 3 14 13 10
- 7 1 4 16 18 12
- 9 6 5 15 17 11
-
-
-
-
- Halftone 8x8 (angled)
-
- 13 7 8 14 17 21 22 18
- 6 1 3 9 28 31 29 23
- 5 2 4 10 27 32 30 24
- 16 12 11 15 20 26 25 19
- 17 21 22 18 13 7 8 14
- 28 31 29 23 6 1 3 9
- 27 32 30 24 5 2 4 10
- 20 26 25 19 16 12 11 15
-
-
-
-
-
- Halftone 4x4 (orthogonal)
-
- 7 13 11 4
- 12 16 14 8
- 10 15 6 2
- 5 9 3 1
-
-
-
-
- Halftone 6x6 (orthogonal)
-
- 7 17 27 14 9 4
- 21 29 33 31 18 11
- 24 32 36 34 25 22
- 19 30 35 28 20 10
- 8 15 26 16 6 2
- 5 13 23 12 3 1
-
-
-
-
- Halftone 8x8 (orthogonal)
-
- 7 21 33 43 36 19 9 4
- 16 27 51 55 49 29 14 11
- 31 47 57 61 59 45 35 23
- 41 53 60 64 62 52 40 38
- 37 44 58 63 56 46 30 22
- 15 28 48 54 50 26 17 10
- 8 18 34 42 32 20 6 2
- 5 13 25 39 24 12 3 1
-
-
-
-
-
- Halftone 16x16 (orthogonal)
-
- 4 12 24 44 72 100 136 152 150 134 98 70 42 23 11 3
- 7 16 32 52 76 104 144 160 158 142 102 74 50 31 15 6
- 19 27 40 60 92 132 168 180 178 166 130 90 58 39 26 18
- 36 48 56 80 124 176 188 204 203 187 175 122 79 55 47 35
- 64 68 84 116 164 200 212 224 223 211 199 162 114 83 67 63
- 88 96 112 156 192 216 232 240 239 231 214 190 154 111 95 87
- 108 120 148 184 208 228 244 252 251 243 226 206 182 147 119 107
- 128 140 172 196 219 235 247 256 255 246 234 218 194 171 139 127
- 126 138 170 195 220 236 248 253 254 245 233 217 193 169 137 125
- 106 118 146 183 207 227 242 249 250 241 225 205 181 145 117 105
- 86 94 110 155 191 215 229 238 237 230 213 189 153 109 93 85
- 62 66 82 115 163 198 210 221 222 209 197 161 113 81 65 61
- 34 46 54 78 123 174 186 202 201 185 173 121 77 53 45 33
- 20 28 37 59 91 131 167 179 177 165 129 89 57 38 25 17
- 8 13 29 51 75 103 143 159 157 141 101 73 49 30 14 5
- 1 9 21 43 71 99 135 151 149 133 97 69 41 22 10 2
-
-
-
-
-
-
- Circles 5x5 (black)
-
- 1 21 16 15 4
- 5 17 20 19 14
- 6 21 25 24 12
- 7 18 22 23 11
- 2 8 9 10 3
-
-
-
-
-
- Circles 5x5 (white)
-
- 25 21 10 11 22
- 20 9 6 7 12
- 19 5 1 2 13
- 18 8 4 3 14
- 24 17 16 15 23
-
-
-
-
- Circles 6x6 (black)
-
- 1 5 14 13 12 4
- 6 22 28 27 21 11
- 15 29 35 34 26 20
- 16 30 36 33 25 19
- 7 23 31 32 24 10
- 2 8 17 18 9 3
-
-
-
-
- Circles 6x6 (white)
-
- 36 32 23 24 25 33
- 31 15 9 10 16 26
- 22 8 2 3 11 17
- 21 7 1 4 12 18
- 30 14 6 5 13 27
- 35 29 20 19 28 34
-
-
-
-
- Circles 7x7 (black)
-
- 3 9 18 28 17 8 2
- 10 24 33 39 32 23 7
- 19 34 44 48 43 31 16
- 25 40 45 49 47 38 27
- 20 35 41 46 42 29 15
- 11 21 36 37 28 22 6
- 4 12 13 26 14 5 1
-
-
-
-
-
- Circles 7x7 (white)
-
- 47 41 32 22 33 42 48
- 40 26 17 11 18 27 43
- 31 16 6 2 7 19 34
- 25 10 5 1 3 12 23
- 30 15 9 4 8 20 35
- 39 29 14 13 21 28 44
- 46 38 37 24 36 45 49
-
-
-
-
-
-
-
diff --git a/etc_org/ImageMagick-6/type-dejavu.xml b/etc_org/ImageMagick-6/type-dejavu.xml
deleted file mode 100644
index 0db1fc8..0000000
--- a/etc_org/ImageMagick-6/type-dejavu.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-]>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/etc_org/ImageMagick-6/type-ghostscript.xml b/etc_org/ImageMagick-6/type-ghostscript.xml
deleted file mode 100644
index d8d554b..0000000
--- a/etc_org/ImageMagick-6/type-ghostscript.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-]>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/etc_org/ImageMagick-6/type-windows.xml b/etc_org/ImageMagick-6/type-windows.xml
deleted file mode 100644
index d6735e0..0000000
--- a/etc_org/ImageMagick-6/type-windows.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-]>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/etc_org/ImageMagick-6/type.xml b/etc_org/ImageMagick-6/type.xml
deleted file mode 100644
index ccf5d65..0000000
--- a/etc_org/ImageMagick-6/type.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-]>
-
-
-
diff --git a/etc_org/NetworkManager/NetworkManager.conf b/etc_org/NetworkManager/NetworkManager.conf
deleted file mode 100644
index 77220e1..0000000
--- a/etc_org/NetworkManager/NetworkManager.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[main]
-plugins=ifupdown,keyfile,ofono
-dns=dnsmasq
-
-[ifupdown]
-managed=false
diff --git a/etc_org/NetworkManager/VPN/nm-pptp-service.name b/etc_org/NetworkManager/VPN/nm-pptp-service.name
deleted file mode 100644
index c81df87..0000000
--- a/etc_org/NetworkManager/VPN/nm-pptp-service.name
+++ /dev/null
@@ -1,13 +0,0 @@
-[VPN Connection]
-name=pptp
-service=org.freedesktop.NetworkManager.pptp
-program=/usr/lib/NetworkManager/nm-pptp-service
-supports-multiple-connections=true
-
-[libnm]
-plugin=/usr/lib/arm-linux-gnueabihf/NetworkManager/libnm-vpn-plugin-pptp.so
-
-[GNOME]
-auth-dialog=/usr/lib/NetworkManager/nm-pptp-auth-dialog
-properties=/usr/lib/arm-linux-gnueabihf/NetworkManager/libnm-pptp-properties
-supports-external-ui-mode=true
diff --git a/etc_org/NetworkManager/conf.d/default-wifi-powersave-on.conf b/etc_org/NetworkManager/conf.d/default-wifi-powersave-on.conf
deleted file mode 100644
index 0580544..0000000
--- a/etc_org/NetworkManager/conf.d/default-wifi-powersave-on.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[connection]
-wifi.powersave = 3
\ No newline at end of file
diff --git a/etc_org/NetworkManager/dispatcher.d/01ifupdown b/etc_org/NetworkManager/dispatcher.d/01ifupdown
deleted file mode 100755
index ebadfd1..0000000
--- a/etc_org/NetworkManager/dispatcher.d/01ifupdown
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh -e
-# Script to dispatch NetworkManager events
-#
-# Runs ifupdown scripts when NetworkManager fiddles with interfaces.
-# See NetworkManager(8) for further documentation of the dispatcher events.
-
-if [ -z "$1" ]; then
- echo "$0: called with no interface" 1>&2
- exit 1;
-fi
-
-if [ -n "$IP4_NUM_ADDRESSES" ] && [ "$IP4_NUM_ADDRESSES" -gt 0 ]; then
- ADDRESS_FAMILIES="$ADDRESS_FAMILIES inet"
-fi
-if [ -n "$IP6_NUM_ADDRESSES" ] && [ "$IP6_NUM_ADDRESSES" -gt 0 ]; then
- ADDRESS_FAMILIES="$ADDRESS_FAMILIES inet6"
-fi
-
-# If we have a VPN connection ignore the underlying IP address(es)
-if [ "$2" = "vpn-up" ] || [ "$2" = "vpn-down" ]; then
- ADDRESS_FAMILIES=""
-fi
-
-if [ -n "$VPN_IP4_NUM_ADDRESSES" ] && [ "$VPN_IP4_NUM_ADDRESSES" -gt 0 ]; then
- ADDRESS_FAMILIES="$ADDRESS_FAMILIES inet"
-fi
-if [ -n "$VPN_IP6_NUM_ADDRESSES" ] && [ "$VPN_IP6_NUM_ADDRESSES" -gt 0 ]; then
- ADDRESS_FAMILIES="$ADDRESS_FAMILIES inet6"
-fi
-
-# We're probably bringing the interface down.
-[ -n "$ADDRESS_FAMILIES" ] || ADDRESS_FAMILIES="inet"
-
-# Fake ifupdown environment
-export IFACE="$1"
-export LOGICAL="$1"
-export METHOD="NetworkManager"
-export VERBOSITY="0"
-
-for i in $ADDRESS_FAMILIES; do
-
- export ADDRFAM="$i"
-
- # Run the right scripts
- case "$2" in
- up|vpn-up)
- export MODE="start"
- export PHASE="post-up"
- run-parts /etc/network/if-up.d
- ;;
- down|vpn-down)
- export MODE="stop"
- export PHASE="post-down"
- run-parts /etc/network/if-post-down.d
- ;;
-# pre-up/pre-down not implemented. See
-# https://bugzilla.gnome.org/show_bug.cgi?id=387832
-# pre-up)
-# export MODE="start"
-# export PHASE="pre-up"
-# run-parts /etc/network/if-pre-up.d
-# ;;
-# pre-down)
-# export MODE="stop"
-# export PHASE="pre-down"
-# run-parts /etc/network/if-down.d
-# ;;
- hostname|dhcp4-change|dhcp6-change)
- # Do nothing
- ;;
- *)
- echo "$0: called with unknown action \`$2'" 1>&2
- exit 1
- ;;
- esac
-done
diff --git a/etc_org/NetworkManager/dispatcher.d/99tlp-rdw-nm b/etc_org/NetworkManager/dispatcher.d/99tlp-rdw-nm
deleted file mode 100755
index b183ef3..0000000
--- a/etc_org/NetworkManager/dispatcher.d/99tlp-rdw-nm
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/sh
-# tlp-rdw - network manager dispatcher hook:
-# enable/disable radios on ifup/ifdown
-#
-# Copyright (c) 2015 Thomas Koch
-# This software is licensed under the GPL v2 or later.
-
-# --- Constants
-readonly LIBDIRS="/usr/lib/tlp-pm /usr/lib64/tlp-pm"
-readonly LIBS="tlp-functions tlp-rf-func"
-
-readonly RDW_NM_LOCK="rdw_nm"
-readonly RDW_NM_LOCKTIME=2
-
-# --- Locate and source libraries
-for libdir in $LIBDIRS; do [ -d $libdir ] && break; done
-[ -d $libdir ] || exit 0
-
-for lib in $LIBS; do
- [ -f $libdir/$lib ] || exit 0
- . $libdir/$lib
-done
-
-# --- MAIN
-read_defaults
-check_tlp_enabled || exit 0
-add_sbin2path
-
-# Get args
-iface="$1"
-action="$2"
-itype="unknown"
-
-# Quit for invalid interfaces
-[ -n "$iface" ] && [ "$iface" != "none" ] || exit 0
-
-echo_debug "nm" "rdw_nm($iface).$action"
-if [ -n "$addpath" ]; then
- echo_debug "path" "PATH=$oldpath[$addpath]"
-else
- echo_debug "path" "PATH=$oldpath"
-fi
-
-# Quit if timed lock in progress
-check_timed_lock $RDW_NM_LOCK && exit 0
-
-# Determine interface type
-if cmd_exists $NMCLI ; then
- # nmcli is available --> check if nmcli dev output matches interface
- itype="$($NMCLI dev | awk '$1 ~ /'$iface'/ { print $2; }')"
-
- if [ -z "$itype" ]; then
- # iface is not found in nmcli dev output: many WWAN devices have
- # different devices for control and the actual network connection
- # --> check if interface matches a WWAN device
- get_wwan_ifaces
- if wordinlist "$iface" "$wanifaces"; then
- itype="wwan"
- else
- itype="unknown"
- fi
- fi
- echo_debug "nm" "rdw_nm($iface).$action: type=$itype [nmcli]"
-else
- # nmcli is not available
- echo_debug "nm" "rdw_nm($iface)$action.nmcli_not_available"
-fi
-
-case $action in
- up) # interface up, disable configured interfaces
-
- set_timed_lock $RDW_NM_LOCK $RDW_NM_LOCKTIME # lock rdw events
-
- case $itype in
- *ethernet)
- for dev in $DEVICES_TO_DISABLE_ON_LAN_CONNECT; do
- [ -n "$dev" ] && device_switch $dev off
- done
- ;;
-
- *wireless|wifi)
- for dev in $DEVICES_TO_DISABLE_ON_WIFI_CONNECT; do
- [ -n "$dev" ] && [ "$dev" != wifi ] && device_switch $dev off
- done
- ;;
-
- gsm|wwan)
- for dev in $DEVICES_TO_DISABLE_ON_WWAN_CONNECT; do
- [ -n "$dev" ] && [ "$dev" != wwan ] && device_switch $dev off
- done
- ;;
- esac
- ;; # up
-
- down) # interface down, enable configured interfaces
- case $itype in
- *ethernet)
- for dev in $DEVICES_TO_ENABLE_ON_LAN_DISCONNECT; do
- [ -n "$dev" ] && device_switch $dev on
- done
- ;;
-
- *wireless|wifi)
- for dev in $DEVICES_TO_ENABLE_ON_WIFI_DISCONNECT; do
- [ -n "$dev" ] && [ "$dev" != wifi ] && device_switch $dev on
- done
- ;;
-
- gsm)
- for dev in $DEVICES_TO_ENABLE_ON_WWAN_DISCONNECT; do
- [ -n "$dev" ] && [ "$dev" != wwan ] && device_switch $dev on
- done
- ;;
- esac
- ;; # down
-
-esac
-
-exit 0
diff --git a/etc_org/UPower/UPower.conf b/etc_org/UPower/UPower.conf
deleted file mode 100644
index e2c6a69..0000000
--- a/etc_org/UPower/UPower.conf
+++ /dev/null
@@ -1,94 +0,0 @@
-# Only the system vendor should modify this file, ordinary users
-# should not have to change anything.
-
-[UPower]
-
-# Enable the Watts Up Pro device.
-#
-# The Watts Up Pro contains a generic FTDI USB device without a specific
-# vendor and product ID. When we probe for WUP devices, we can cause
-# the user to get a perplexing "Device or resource busy" error when
-# attempting to use their non-WUP device.
-#
-# The generic FTDI device is known to also be used on:
-#
-# - Sparkfun FT232 breakout board
-# - Parallax Propeller
-#
-# default=false
-EnableWattsUpPro=false
-
-# Don't poll the kernel for battery level changes.
-#
-# Some hardware will send us battery level changes through
-# events, rather than us having to poll for it. This option
-# allows disabling polling for hardware that sends out events.
-#
-# default=false
-NoPollBatteries=false
-
-# Do we ignore the lid state
-#
-# Some laptops are broken. The lid state is either inverted, or stuck
-# on or off. We can't do much to fix these problems, but this is a way
-# for users to make the laptop panel vanish, a state that might be used
-# by a couple of user-space daemons. On Linux systems, see also
-# logind.conf(5).
-#
-# default=false
-IgnoreLid=false
-
-# Policy for warnings and action based on battery levels
-#
-# Whether battery percentage based policy should be used. The default
-# is to use the time left, change to true to use the percentage, which
-# should work around broken firmwares. It is also more reliable than
-# the time left (frantically saving all your files is going to use more
-# battery than letting it rest for example).
-# default=true
-UsePercentageForPolicy=true
-
-# When UsePercentageForPolicy is true, the levels at which UPower will
-# consider the battery low, critical, or take action for the critical
-# battery level.
-#
-# This will also be used for batteries which don't have time information
-# such as that of peripherals.
-#
-# If any value is invalid, or not in descending order, the defaults
-# will be used.
-#
-# Defaults:
-# PercentageLow=10
-# PercentageCritical=3
-# PercentageAction=2
-PercentageLow=10
-PercentageCritical=3
-PercentageAction=2
-
-# When UsePercentageForPolicy is false, the time remaining at which UPower
-# will consider the battery low, critical, or take action for the critical
-# battery level.
-#
-# If any value is invalid, or not in descending order, the defaults
-# will be used.
-#
-# Defaults:
-# TimeLow=1200
-# TimeCritical=300
-# TimeAction=120
-TimeLow=1200
-TimeCritical=300
-TimeAction=120
-
-# The action to take when "TimeAction" or "PercentageAction" above has been
-# reached for the batteries (UPS or laptop batteries) supplying the computer
-#
-# Possible values are:
-# PowerOff
-# Hibernate
-# HybridSleep
-#
-# If HybridSleep isn't available, Hibernate will be used
-# If Hibernate isn't available, PowerOff will be used
-CriticalPowerAction=HybridSleep
diff --git a/etc_org/X11/Xreset b/etc_org/X11/Xreset
deleted file mode 100755
index 7a0974c..0000000
--- a/etc_org/X11/Xreset
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# /etc/X11/Xreset
-#
-# global Xreset file -- for use by display managers
-
-# $Id: Xsession 967 2005-12-27 07:20:55Z dnusinow $
-
-set -e
-
-PROGNAME=Xreset
-SYSSESSIONDIR=/etc/X11/Xreset.d
-
-if [ ! -d "$SYSSESSIONDIR" ]; then
- # Nothing to do, exiting
- exit 0
-fi
-
-# use run-parts to source every file in the session directory; we source
-# instead of executing so that the variables and functions defined above
-# are available to the scripts, and so that they can pass variables to each
-# other
-SESSIONFILES=$(run-parts --list $SYSSESSIONDIR)
-if [ -n "$SESSIONFILES" ]; then
- set +e
- for SESSIONFILE in $SESSIONFILES; do
- . $SESSIONFILE
- done
- set -e
-fi
-
-exit 0
-
-# vim:set ai et sts=2 sw=2 tw=80:
diff --git a/etc_org/X11/Xreset.d/README b/etc_org/X11/Xreset.d/README
deleted file mode 100644
index 3c03f42..0000000
--- a/etc_org/X11/Xreset.d/README
+++ /dev/null
@@ -1,4 +0,0 @@
-# Scripts in this directory are executed as root when a user log out from
-# a display manager using /etc/X11/Xreset.
-# The username of the user logging out is provided in the $USER environment
-# variable.
diff --git a/etc_org/X11/Xresources/x11-common b/etc_org/X11/Xresources/x11-common
deleted file mode 100644
index 7641207..0000000
--- a/etc_org/X11/Xresources/x11-common
+++ /dev/null
@@ -1,10 +0,0 @@
-! $Id$
-
-! load color-specific resources for clients that have them
-#ifdef COLOR
-*customization: -color
-#endif
-
-! make Xaw (Athena widget set) clients understand the delete key
-! this causes problems with some non-Xaw apps, use with care
-! *Text.translations: #override ~Shift ~Meta Delete: delete-next-character()
diff --git a/etc_org/X11/Xsession b/etc_org/X11/Xsession
deleted file mode 100755
index 6b071c7..0000000
--- a/etc_org/X11/Xsession
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/sh
-#
-# /etc/X11/Xsession
-#
-# global Xsession file -- used by display managers and xinit (startx)
-
-# $Id: Xsession 967 2005-12-27 07:20:55Z dnusinow $
-
-set -e
-
-PROGNAME=Xsession
-
-message () {
- # pretty-print messages of arbitrary length; use xmessage if it
- # is available and $DISPLAY is set
- MESSAGE="$PROGNAME: $*"
- echo "$MESSAGE" | fold -s -w ${COLUMNS:-80} >&2
- if [ -n "$DISPLAY" ] && which xmessage > /dev/null 2>&1; then
- echo "$MESSAGE" | fold -s -w ${COLUMNS:-80} | xmessage -center -file -
- fi
-}
-
-message_nonl () {
- # pretty-print messages of arbitrary length (no trailing newline); use
- # xmessage if it is available and $DISPLAY is set
- MESSAGE="$PROGNAME: $*"
- echo -n "$MESSAGE" | fold -s -w ${COLUMNS:-80} >&2;
- if [ -n "$DISPLAY" ] && which xmessage > /dev/null 2>&1; then
- echo -n "$MESSAGE" | fold -s -w ${COLUMNS:-80} | xmessage -center -file -
- fi
-}
-
-errormsg () {
- # exit script with error
- message "$*"
- exit 1
-}
-
-internal_errormsg () {
- # exit script with error; essentially a "THIS SHOULD NEVER HAPPEN" message
- # One big call to message() for the sake of xmessage; if we had two then
- # the user would have dismissed the error we want reported before seeing the
- # request to report it.
- errormsg "$*" \
- "Please report the installed version of the \"x11-common\"" \
- "package and the complete text of this error message to" \
- "."
-}
-
-# initialize variables for use by all session scripts
-
-OPTIONFILE=/etc/X11/Xsession.options
-
-SYSRESOURCES=/etc/X11/Xresources
-USRRESOURCES=$HOME/.Xresources
-
-SYSSESSIONDIR=/etc/X11/Xsession.d
-USERXSESSION=$HOME/.xsession
-USERXSESSIONRC=$HOME/.xsessionrc
-ALTUSERXSESSION=$HOME/.Xsession
-ERRFILE=$HOME/.xsession-errors
-
-# attempt to create an error file; abort if we cannot
-if (umask 077 && touch "$ERRFILE") 2> /dev/null && [ -w "$ERRFILE" ] &&
- [ ! -L "$ERRFILE" ]; then
- chmod 600 "$ERRFILE"
-elif ERRFILE=$(tempfile 2> /dev/null); then
- if ! ln -sf "$ERRFILE" "${TMPDIR:=/tmp}/xsession-$USER"; then
- message "warning: unable to symlink \"$TMPDIR/xsession-$USER\" to" \
- "\"$ERRFILE\"; look for session log/errors in" \
- "\"$TMPDIR/xsession-$USER\"."
- fi
-else
- errormsg "unable to create X session log/error file; aborting."
-fi
-
-# truncate ERRFILE if it is too big to avoid disk usage DoS
-if [ "`stat -c%s \"$ERRFILE\"`" -gt 500000 ]; then
- T=`mktemp -p "$HOME"`
- tail -c 500000 "$ERRFILE" > "$T" && mv -f "$T" "$ERRFILE" || rm -f "$T"
-fi
-
-exec >>"$ERRFILE" 2>&1
-
-echo "$PROGNAME: X session started for $LOGNAME at $(date)"
-
-# sanity check; is our session script directory present?
-if [ ! -d "$SYSSESSIONDIR" ]; then
- errormsg "no \"$SYSSESSIONDIR\" directory found; aborting."
-fi
-
-# Attempt to create a file of non-zero length in /tmp; a full filesystem can
-# cause mysterious X session failures. We do not use touch, :, or test -w
-# because they won't actually create a file with contents. We also let standard
-# error from tempfile and echo go to the error file to aid the user in
-# determining what went wrong.
-WRITE_TEST=$(tempfile)
-if ! echo "*" >>"$WRITE_TEST"; then
- message "warning: unable to write to ${WRITE_TEST%/*}; X session may exit" \
- "with an error"
-fi
-rm -f "$WRITE_TEST"
-
-# use run-parts to source every file in the session directory; we source
-# instead of executing so that the variables and functions defined above
-# are available to the scripts, and so that they can pass variables to each
-# other
-SESSIONFILES=$(run-parts --list $SYSSESSIONDIR)
-if [ -n "$SESSIONFILES" ]; then
- set +e
- for SESSIONFILE in $SESSIONFILES; do
- . $SESSIONFILE
- done
- set -e
-fi
-
-exit 0
-
-# vim:set ai et sts=2 sw=2 tw=80:
diff --git a/etc_org/X11/Xsession.d/20x11-common_process-args b/etc_org/X11/Xsession.d/20x11-common_process-args
deleted file mode 100644
index 149d1d2..0000000
--- a/etc_org/X11/Xsession.d/20x11-common_process-args
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: 20x11-common_process-args 305 2005-07-03 18:51:43Z dnusinow $
-
-# This file is sourced by Xsession(5), not executed.
-
-# read OPTIONFILE
-OPTIONS=$(cat "$OPTIONFILE") || true
-
-has_option() {
- if [ "${OPTIONS#*
-$1}" != "$OPTIONS" ]; then
- return 0
- else
- return 1
- fi
-}
-
-# Determine how many arguments were provided.
-case $# in
- 0)
- # No arguments given; use default behavior.
- ;;
- 1)
- # One argument given; see what it was.
- case "$1" in
- failsafe)
- # Failsafe session was requested.
- if has_option allow-failsafe; then
- if [ -e /usr/bin/x-terminal-emulator ]; then
- if [ -x /usr/bin/x-terminal-emulator ]; then
- exec x-terminal-emulator -geometry +1+1
- else
- # fatal error
- errormsg "unable to launch failsafe X session ---" \
- "x-terminal-emulator not executable; aborting."
- fi
- else
- # fatal error
- errormsg "unable to launch failsafe X session ---" \
- "x-terminal-emulator not found; aborting."
- fi
- fi
- ;;
- default)
- # Default behavior was requested.
- ;;
- *)
- # Specific program was requested.
- STARTUP_FULL_PATH=$(/usr/bin/which "${1%% *}" || true)
- if [ -n "$STARTUP_FULL_PATH" ] && [ -e "$STARTUP_FULL_PATH" ]; then
- if [ -x "$STARTUP_FULL_PATH" ]; then
- STARTUP="$1"
- else
- message "unable to launch \"$1\" X session ---" \
- "\"$1\" not executable; falling back to default session."
- fi
- else
- message "unable to launch \"$1\" X session ---" \
- "\"$1\" not found; falling back to default session."
- fi
- ;;
- esac
- ;;
- *)
- # More than one argument given; we don't know what to do.
- message "unsupported number of arguments ($#); falling back to default" \
- "session."
- ;;
-esac
-
-# vim:set ai et sts=2 sw=2 tw=80:
diff --git a/etc_org/X11/Xsession.d/30x11-common_xresources b/etc_org/X11/Xsession.d/30x11-common_xresources
deleted file mode 100644
index c3f53a8..0000000
--- a/etc_org/X11/Xsession.d/30x11-common_xresources
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: 30x11-common_xresources 305 2005-07-03 18:51:43Z dnusinow $
-
-# This file is sourced by Xsession(5), not executed.
-
-# If xrdb (from xbase-clients) is installed, merge system-wide X resources.
-# Then merge the user's X resources, if the options file is so configured.
-if [ -d "$SYSRESOURCES" ] && type xrdb >/dev/null 2>&1; then
- RESOURCEFILES=$(run-parts --list $SYSRESOURCES)
- if [ -n "$RESOURCEFILES" ]; then
- for RESOURCEFILE in $RESOURCEFILES; do
- xrdb -merge $RESOURCEFILE
- done
- fi
-fi
-
-if has_option allow-user-resources && [ -f "$USRRESOURCES" ]; then
- if type xrdb >/dev/null 2>&1; then
- xrdb -merge $USRRESOURCES
- else
- # Comment out this command if you desire a legacy-free X environment, and find
- # the warning spurious.
- message "warning: xrdb command not found; X resources not merged."
- fi
-fi
-
-# vim:set ai et sts=2 sw=2 tw=80:
diff --git a/etc_org/X11/Xsession.d/35x11-common_xhost-local b/etc_org/X11/Xsession.d/35x11-common_xhost-local
deleted file mode 100644
index d127a6c..0000000
--- a/etc_org/X11/Xsession.d/35x11-common_xhost-local
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file is sourced by Xsession(5), not executed.
-
-# If xhost (from x11-xserver-utils) is installed, use it to give access
-# to the X server to any process from the same user on the local host.
-# Unlike other uses of xhost, this is safe since the kernel can check
-# the actual owner of the calling process.
-
-if type xhost >/dev/null 2>&1; then
- xhost +si:localuser:$(id -un) || :
-fi
diff --git a/etc_org/X11/Xsession.d/40x11-common_xsessionrc b/etc_org/X11/Xsession.d/40x11-common_xsessionrc
deleted file mode 100644
index 305f363..0000000
--- a/etc_org/X11/Xsession.d/40x11-common_xsessionrc
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is sourced by Xsession(5), not executed.
-
-#Source user defined xsessionrc (locales and other environment variables)
-if [ -r "$USERXSESSIONRC" ]; then
- . "$USERXSESSIONRC"
-fi
diff --git a/etc_org/X11/Xsession.d/50x11-common_determine-startup b/etc_org/X11/Xsession.d/50x11-common_determine-startup
deleted file mode 100644
index 4e13505..0000000
--- a/etc_org/X11/Xsession.d/50x11-common_determine-startup
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: 50x11-common_determine-startup 305 2005-07-03 18:51:43Z dnusinow $
-
-# This file is sourced by Xsession(5), not executed.
-
-# If no X session startup program was passed to the Xsession script as an
-# argument (e.g., by the display manager), or if that program was not
-# executable, fall back to looking for a user's custom X session script, if
-# allowed by the options file.
-if [ -z "$STARTUP" ]; then
- if has_option allow-user-xsession; then
- for STARTUPFILE in "$USERXSESSION" "$ALTUSERXSESSION"; do
- if [ -e "$STARTUPFILE" ]; then
- if [ -x "$STARTUPFILE" ]; then
- STARTUP="$STARTUPFILE"
- else
- shell=${SHELL:-sh}
- STARTUP="$shell $STARTUPFILE"
- fi
- break
- fi
- done
- fi
-fi
-
-# If there is still nothing to use for a startup program, try the system
-# default session manager, window manager, and terminal emulator.
-if [ -z "$STARTUP" ]; then
- if [ -x /usr/bin/x-session-manager ]; then
- STARTUP=x-session-manager
- elif [ -x /usr/bin/x-window-manager ]; then
- STARTUP=x-window-manager
- elif [ -x /usr/bin/x-terminal-emulator ]; then
- STARTUP=x-terminal-emulator
- fi
-fi
-
-# If we still have not found a startup program, give up.
-if [ -z "$STARTUP" ]; then
- ERRMSG="unable to start X session ---"
- if has_option allow-user-xsession; then
- ERRMSG="$ERRMSG no \"$USERXSESSION\" file, no \"$ALTUSERXSESSION\" file,"
- fi
- errormsg "$ERRMSG no session managers, no window managers, and no terminal" \
- "emulators found; aborting."
-fi
-
-# vim:set ai et sts=2 sw=2 tw=80:
diff --git a/etc_org/X11/Xsession.d/55mate-session_materc b/etc_org/X11/Xsession.d/55mate-session_materc
deleted file mode 100644
index b285d9a..0000000
--- a/etc_org/X11/Xsession.d/55mate-session_materc
+++ /dev/null
@@ -1,23 +0,0 @@
-# If we are running the MATE session, source ~/.materc
-
-BASESTARTUP=${STARTUP%% *}
-BASESTARTUP=${BASESTARTUP##*/}
-if [ "$BASESTARTUP" = x-session-manager ]; then
- BASESTARTUP=$(basename $(readlink /etc/alternatives/x-session-manager))
-fi
-case "$BASESTARTUP" in
- mate-session*)
- MATERC=$HOME/.materc
- if [ -r "$MATERC" ]; then
- . "$MATERC"
- fi
- # We prepend /usr/share/mate since its defaults.list actually points
- # to /etc so it is configurable.
- if [ -z "$XDG_DATA_DIRS" ]; then
- XDG_DATA_DIRS=/usr/share/mate:/usr/local/share/:/usr/share/
- else
- XDG_DATA_DIRS=/usr/share/mate:"$XDG_DATA_DIRS"
- fi
- export XDG_DATA_DIRS
- ;;
-esac
diff --git a/etc_org/X11/Xsession.d/60x11-common_localhost b/etc_org/X11/Xsession.d/60x11-common_localhost
deleted file mode 100644
index 094f6b9..0000000
--- a/etc_org/X11/Xsession.d/60x11-common_localhost
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file is sourced by Xsession(5), not executed.
-
-[ -x /usr/bin/xhost ] && [ -x /usr/bin/id ] &&
- xhost +si:localuser:`id -un` > /dev/null
diff --git a/etc_org/X11/Xsession.d/60x11-common_xdg_path b/etc_org/X11/Xsession.d/60x11-common_xdg_path
deleted file mode 100644
index 29491c3..0000000
--- a/etc_org/X11/Xsession.d/60x11-common_xdg_path
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file is sourced by Xsession(5), not executed.
-# Add additionnal xdg paths depending on selected desktop session
-
-DEFAULT_XDG_CONFIG_DIRS='/etc/xdg'
-DEFAULT_XDG_DATA_DIRS='/usr/local/share/:/usr/share/'
-if [ -n "$DESKTOP_SESSION" ]; then
- # readd default if was empty
- if [ -z "$XDG_CONFIG_DIRS" ]; then
- XDG_CONFIG_DIRS="$DEFAULT_XDG_CONFIG_DIRS"
- fi
- XDG_CONFIG_DIRS="$DEFAULT_XDG_CONFIG_DIRS"/xdg-"$DESKTOP_SESSION":"$XDG_CONFIG_DIRS"
- export XDG_CONFIG_DIRS
- # gnome is already added if gnome-session installed
- if [ "$DESKTOP_SESSION" != "gnome" ]; then
- if [ -z "$XDG_DATA_DIRS" ]; then
- XDG_DATA_DIRS="$DEFAULT_XDG_DATA_DIRS"
- fi
- XDG_DATA_DIRS=/usr/share/"$DESKTOP_SESSION":"$XDG_DATA_DIRS"
- export XDG_DATA_DIRS
- fi
-fi
-
diff --git a/etc_org/X11/Xsession.d/60xbrlapi b/etc_org/X11/Xsession.d/60xbrlapi
deleted file mode 100644
index f1d7a38..0000000
--- a/etc_org/X11/Xsession.d/60xbrlapi
+++ /dev/null
@@ -1 +0,0 @@
-if [ -x /usr/bin/xbrlapi ]; then /usr/bin/xbrlapi -q & fi
diff --git a/etc_org/X11/Xsession.d/60xdg-user-dirs-update b/etc_org/X11/Xsession.d/60xdg-user-dirs-update
deleted file mode 100644
index 7a0f8ab..0000000
--- a/etc_org/X11/Xsession.d/60xdg-user-dirs-update
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -x /usr/bin/xdg-user-dirs-update ]; then
- /usr/bin/xdg-user-dirs-update
-fi
diff --git a/etc_org/X11/Xsession.d/70gconfd_path-on-session b/etc_org/X11/Xsession.d/70gconfd_path-on-session
deleted file mode 100644
index ab8f913..0000000
--- a/etc_org/X11/Xsession.d/70gconfd_path-on-session
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file is sourced by Xsession(5), not executed.
-# Add additional gconf path depending on selected desktop session
-
-GCONF_PREFIX="/usr/share/gconf"
-if [ -n "$DESKTOP_SESSION" ]; then
- export MANDATORY_PATH=${GCONF_PREFIX}/${DESKTOP_SESSION}.mandatory.path
- export DEFAULTS_PATH=${GCONF_PREFIX}/${DESKTOP_SESSION}.default.path
-fi
-
diff --git a/etc_org/X11/Xsession.d/70im-config_launch b/etc_org/X11/Xsession.d/70im-config_launch
deleted file mode 100644
index be7be70..0000000
--- a/etc_org/X11/Xsession.d/70im-config_launch
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-# vim: set sts=4 expandtab:
-# Copyright (C) 2012 Osamu Aoki
-# Copyright (C) 2012 Aron Xu
-# GNU General Public License version 2 or later.
-#
-# Input Method launcher hook ... see im-launch(1).
-# The hook script for dbus-launch is in 75 which changes $STARTUP string.
-# This shuld be befor this dbus-launch hook to ensure the working dbus
-# for input method. Thus moved from 80 to 70.
-
-IMLAUNCH=/usr/bin/im-launch
-
-# If already tweaked, keep hands off :-)
-# If im-config is removed but not purged, keep hands off :-)
-if [ -z "$XMODIFIERS" ] && \
- [ -z "$GTK_IM_MODULE" ] && \
- [ -z "$QT_IM_MODULE" ] && \
- [ -z "$QT4_IM_MODULE" ] && \
- [ -z "$CLUTTER_IM_MODULE" ] && \
- [ -r /usr/share/im-config/xinputrc.common ]; then
- IM_CONFIG_PHASE=1
- export IM_CONFIG_PHASE
- # initialize all im-config common functions and parameters
- . /usr/share/im-config/xinputrc.common
- unset TEXTDOMAIN
- unset TEXTDOMAINDIR
- # source the first found configuration file
- if [ -r "$IM_CONFIG_XINPUTRC_USR" ]; then
- . $IM_CONFIG_XINPUTRC_USR
- elif [ -r "$IM_CONFIG_XINPUTRC_SYS" ]; then
- . $IM_CONFIG_XINPUTRC_SYS
- fi
- # always export variables even for manual configuration.
- export XMODIFIERS
- export GTK_IM_MODULE
- export QT_IM_MODULE
- export QT4_IM_MODULE
- export CLUTTER_IM_MODULE
-fi
-
-# Change $STARTUP string to im-launch while keeping the old $STARTUP string
-# as its arguments
-if [ -x "$IMLAUNCH" ]; then
- STARTUP="$IMLAUNCH $STARTUP"
-fi
diff --git a/etc_org/X11/Xsession.d/75dbus_dbus-launch b/etc_org/X11/Xsession.d/75dbus_dbus-launch
deleted file mode 100644
index 2b5cc57..0000000
--- a/etc_org/X11/Xsession.d/75dbus_dbus-launch
+++ /dev/null
@@ -1,17 +0,0 @@
-# $Id:$
-# In order to activate the session bus at X session launch
-# simply place use-session-dbus into your /etc/X11/Xsession.options file
-#
-
-STARTDBUS=
-DBUSLAUNCH=/usr/bin/dbus-launch
-
-if has_option use-session-dbus; then
- if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && [ -x "$DBUSLAUNCH" ]; then
- STARTDBUS=yes
- fi
-fi
-
-if [ -n "$STARTDBUS" ]; then
- STARTUP="$DBUSLAUNCH --exit-with-session $STARTUP"
-fi
diff --git a/etc_org/X11/Xsession.d/90atk-adaptor b/etc_org/X11/Xsession.d/90atk-adaptor
deleted file mode 100644
index be04b9e..0000000
--- a/etc_org/X11/Xsession.d/90atk-adaptor
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- sh -*-
-# Xsession.d script to set the GTK_MODULES env variable to load atk
-#
-# This file is sourced by Xsession(5), not executed.
-
-add_module()
-{
- case :$GTK_MODULES: in
- *:$1:*)
- ;;
- *)
- if [ -z "$GTK_MODULES" ]
- then
- GTK_MODULES=$1
- else
- GTK_MODULES=$GTK_MODULES:$1
- fi
- ;;
- esac
-}
-
-add_module gail
-add_module atk-bridge
-
-export GTK_MODULES
diff --git a/etc_org/X11/Xsession.d/90gpg-agent b/etc_org/X11/Xsession.d/90gpg-agent
deleted file mode 100644
index 8886f95..0000000
--- a/etc_org/X11/Xsession.d/90gpg-agent
+++ /dev/null
@@ -1,19 +0,0 @@
-: ${GNUPGHOME=$HOME/.gnupg}
-
-GPGAGENT=/usr/bin/gpg-agent
-
-if grep -qs '^[[:space:]]*use-agent' "$GNUPGHOME/gpg.conf" "$GNUPGHOME/options" &&
- test -x $GPGAGENT; then
-
- # Invoking gpg-agent with no arguments exits successfully if the agent
- # is already running on the standard socket
- if ! $GPGAGENT 2>/dev/null; then
- "$GPGAGENT" --daemon
- fi
- GPG_AGENT_INFO="${GNUPGHOME}/S.gpg-agent:0:1"
- export GPG_AGENT_INFO
- if grep -qs '^[[:space:]]*enable-ssh-support' "${GNUPGHOME}/gpg-agent.conf"; then
- SSH_AUTH_SOCK="${GNUPGHOME}/S.gpg-agent.ssh"
- export SSH_AUTH_SOCK
- fi
-fi
diff --git a/etc_org/X11/Xsession.d/90qt-a11y b/etc_org/X11/Xsession.d/90qt-a11y
deleted file mode 100644
index b5903d6..0000000
--- a/etc_org/X11/Xsession.d/90qt-a11y
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- sh -*-
-# Xsession.d script to set the env variables to enable accessibility for Qt
-#
-# This file is sourced by Xsession(5), not executed.
-
-QT_ACCESSIBILITY=1
-QT_LINUX_ACCESSIBILITY_ALWAYS_ON=1
-
-export QT_ACCESSIBILITY QT_LINUX_ACCESSIBILITY_ALWAYS_ON
diff --git a/etc_org/X11/Xsession.d/90x11-common_ssh-agent b/etc_org/X11/Xsession.d/90x11-common_ssh-agent
deleted file mode 100644
index 5397434..0000000
--- a/etc_org/X11/Xsession.d/90x11-common_ssh-agent
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: 90x11-common_ssh-agent 305 2005-07-03 18:51:43Z dnusinow $
-
-# This file is sourced by Xsession(5), not executed.
-
-STARTSSH=
-SSHAGENT=/usr/bin/ssh-agent
-SSHAGENTARGS=
-
-if has_option use-ssh-agent; then
- if [ -x "$SSHAGENT" ] && [ -z "$SSH_AUTH_SOCK" ] \
- && [ -z "$SSH2_AUTH_SOCK" ]; then
- STARTSSH=yes
- if [ -f /usr/bin/ssh-add1 ] && cmp -s $SSHAGENT /usr/bin/ssh-agent2; then
- # use ssh-agent2's ssh-agent1 compatibility mode
- SSHAGENTARGS=-1
- fi
- fi
-fi
-
-if [ -n "$STARTSSH" ]; then
- STARTUP="$SSHAGENT $SSHAGENTARGS ${TMPDIR:+env TMPDIR=$TMPDIR} $STARTUP"
-fi
-
-# vim:set ai et sts=2 sw=2 tw=80:
diff --git a/etc_org/X11/Xsession.d/95dbus_update-activation-env b/etc_org/X11/Xsession.d/95dbus_update-activation-env
deleted file mode 100644
index 1626e74..0000000
--- a/etc_org/X11/Xsession.d/95dbus_update-activation-env
+++ /dev/null
@@ -1,17 +0,0 @@
-# vim:set ft=sh sw=2 sts=2 et:
-
-if [ -n "$DBUS_SESSION_BUS_ADDRESS" ] && \
- [ -x "/usr/bin/dbus-update-activation-environment" ]; then
- # subshell so we can unset environment variables
- (
- # unset login-session-specifics
- unset XDG_SEAT
- unset XDG_SESSION_ID
- unset XDG_VTNR
-
- # tell dbus-daemon --session (and systemd --user, if running)
- # to put the Xsession's environment in activated services'
- # environments
- dbus-update-activation-environment --verbose --systemd --all
- )
-fi
diff --git a/etc_org/X11/Xsession.d/99mate-environment b/etc_org/X11/Xsession.d/99mate-environment
deleted file mode 100644
index 62a9a23..0000000
--- a/etc_org/X11/Xsession.d/99mate-environment
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file is sourced by Xsession(5), not executed.
-
-if [ "x$DESKTOP_SESSION" = "xmate" ] || [ "x$XDG_SESSION_DESKTOP" == "xmate" ]; then
- if [ -z "$GTK_MODULES" ] ; then
- GTK_MODULES="canberra-gtk-module:topmenu-gtk-module"
- else
- GTK_MODULES="$GTK_MODULES:canberra-gtk-module:topmenu-gtk-module"
- fi
- export GTK_MODULES
-
- # Disable GTK3 overlay scrollbars
- export GTK_OVERLAY_SCROLLING=0
-
- # QT apps to use GTK styling
- export QT_STYLE_OVERRIDE=gtk
-
- # Workaround clutter issue (LP: #1462445)
- export CLUTTER_BACKEND=x11
-fi
diff --git a/etc_org/X11/Xsession.d/99x11-common_start b/etc_org/X11/Xsession.d/99x11-common_start
deleted file mode 100644
index 36a9652..0000000
--- a/etc_org/X11/Xsession.d/99x11-common_start
+++ /dev/null
@@ -1,7 +0,0 @@
-# $Id: 99x11-common_start 305 2005-07-03 18:51:43Z dnusinow $
-
-# This file is sourced by Xsession(5), not executed.
-
-exec $STARTUP
-
-# vim:set ai et sts=2 sw=2 tw=80:
diff --git a/etc_org/X11/Xsession.options b/etc_org/X11/Xsession.options
deleted file mode 100644
index fc45bf9..0000000
--- a/etc_org/X11/Xsession.options
+++ /dev/null
@@ -1,9 +0,0 @@
-# $Id: Xsession.options 189 2005-06-11 00:04:27Z branden $
-#
-# configuration options for /etc/X11/Xsession
-# See Xsession.options(5) for an explanation of the available options.
-allow-failsafe
-allow-user-resources
-allow-user-xsession
-use-ssh-agent
-use-session-dbus
diff --git a/etc_org/X11/app-defaults/Bitmap b/etc_org/X11/app-defaults/Bitmap
deleted file mode 100644
index e55fce0..0000000
--- a/etc_org/X11/app-defaults/Bitmap
+++ /dev/null
@@ -1,228 +0,0 @@
-! The App-defaults file for Bitmap.
-
-*TransientShell.allowShellResize: True
-*shapeStyle: oval
-*cursor: left_ptr
-*pane.orientation: horizontal
-
-*Form*top: ChainTop
-*Form*bottom: ChainTop
-*Form*left: ChainLeft
-*Form*right: ChainLeft
-
-*MenuButton.leftBitmap: menu12
-*form*width: 120
-*form*height: 15
-
-*baseTranslations:#override\
- Ctrlc: do-quit()\n\
- q: do-quit()\n\
- Ctrln: do-new()\n\
- Ctrlf: do-load()\n\
- Ctrli: do-insert()\n\
- Ctrls: do-save()\n\
- Ctrlw: do-save-as()\n\
- Ctrlr: do-resize()\n\
- Ctrlx: do-rescale()\n\
- Ctrle: do-filename()\n\
- Ctrlb: do-basename()\n\
- Metai: switch-image()\n\
- Metag: switch-grid()\n\
- Metad: switch-dashed()\n\
- Metaa: switch-axes()\n\
- Metas: switch-stippled()\n\
- Metap: switch-proportional()\n\
- Metaz: switch-zoom()\n\
- Metac: do-cut()\n\
- Metaw: do-copy()\n\
- Metay: do-paste()
-
-
-*Toggle.translations: : highlight(WhenUnset)\n\
- : unhighlight()\n\
- ,: set() notify()
-
-*MenuButton.translations:: highlight()\n\
- : reset()\n\
- Any: reset() fix-menu() PopupMenu()
-
-*Dialog*baseTranslations:#override\
- Return: set-dialog-button(okay, yes, retry)\n\
- Ctrlg: set-dialog-button(cancel, abort)
-*image*baseTranslations:#override\
- ,: switch-image()
-*image*width: 0
-*image*height: 0
-*image*Label.internalWidth: 0
-*image*Label.internalHeight: 0
-*image*normalImage.foreground: white
-*image*normalImage.background: black
-*image*invertedImage.foreground: black
-*image*invertedImage.background: white
-
-*bitmap.cursor: tcross
-*bitmap.dashes: Dashes
-*bitmap.stipple: Stipple
-*bitmap.stippled: on
-
-*TransientShell.width: 300
-
-*input*icon: Term
-*qsave*icon: Term
-*error*icon: Excl
-*Dialog.yes.label: Yes
-*Dialog.no.label: No
-*Dialog.okay.label: OK
-*Dialog.abort.label: Abort
-*Dialog.cancel.label: Cancel
-*Dialog.retry.label: Retry
-
-*MenuButton.width: 58
-
-*SimpleMenu.width: 0
-*SimpleMenu.height: 0
-*SimpleMenu.cursor: hand2
-*SimpleMenu.line.height: 0
-
-*fileButton.label: File
-*fileButton.menuName: fileMenu
-
-*editButton.label: Edit
-*editButton.fromHoriz: fileButton
-*editButton.menuName: editMenu
-
-*formy.status*top: ChainTop
-*formy.status*bottom: ChainTop
-*formy.status*left: ChainLeft
-*formy.status*right: ChainRight
-*status.fromHoriz: editButton
-*status.borderWidth: 0
-
-*SmeBSB.HorizontalMargins: 32
-
-*fileMenu.new.label: New (Ctrl-N)...
-*fileMenu.load.label: Load (Ctrl-F)...
-*fileMenu.insert.label: Insert (Ctrl-I)...
-*fileMenu.save.label: Save (Ctrl-S)
-*fileMenu.saveAs.label: Save As (Ctrl-W)...
-*fileMenu.resize.label: Resize (Ctrl-R)...
-*fileMenu.rescale.label: Rescale (Ctrl-X)...
-*fileMenu.filename.label: Filename (Ctrl-E)...
-*fileMenu.basename.label: Basename (Ctrl-B)...
-*fileMenu.quit.label: Quit (Ctrl-C, Q)
-
-*editMenu.image.label: Image (Meta-I)
-*editMenu.grid.label: Grid (Meta-G)
-*editMenu.dashed.label: Dashed (Meta-D)
-*editMenu.axes.label: Axes (Meta-A)
-*editMenu.stippled.label: Stippled (Meta-S)
-*editMenu.proportional.label: Proportional (Meta-P)
-*editMenu.zoom.label: Zoom (Meta-Z)
-*editMenu.cut.label: Cut (Meta-C)
-*editMenu.copy.label: Copy (Meta-W)
-*editMenu.paste.label: Paste (Meta-Y, Ctrl-mb)
-
-*form.clear.label: Clear
-*form.set.fromVert: clear
-*form.set.label: Set
-*form.invert.fromVert: set
-*form.invert.label: Invert
-
-*form.mark.vertDistance: 10
-*form.mark.fromVert: invert
-*form.mark.label: Mark
-*form.unmark.fromVert: mark
-*form.unmark.label: Unmark
-
-*form.copy.vertDistance: 10
-*form.copy.fromVert: unmark
-*form.copy.radioGroup: mark
-*form.copy.label: Copy
-*form.move.fromVert: copy
-*form.move.radioGroup: copy
-*form.move.label: Move
-
-*form.flipHoriz.vertDistance: 10
-*form.flipHoriz.width: 36
-*form.flipHoriz.height: 36
-*form.flipHoriz.fromVert: move
-*form.flipHoriz.bitmap: FlipHoriz
-*form.up.vertDistance: 10
-*form.up.width: 36
-*form.up.height: 36
-*form.up.fromVert: move
-*form.up.fromHoriz: flipHoriz
-*form.up.bitmap: Up
-*form.flipVert.vertDistance: 10
-*form.flipVert.width: 36
-*form.flipVert.height: 36
-*form.flipVert.fromVert: move
-*form.flipVert.fromHoriz: up
-*form.flipVert.bitmap: FlipVert
-*form.left.width: 36
-*form.left.height: 36
-*form.left.fromVert: flipHoriz
-*form.left.bitmap: Left
-*form.fold.width: 36
-*form.fold.height: 36
-*form.fold.fromVert: up
-*form.fold.fromHoriz: left
-*form.fold.bitmap: Fold
-*form.right.width: 36
-*form.right.height: 36
-*form.right.fromVert: flipVert
-*form.right.fromHoriz: fold
-*form.right.bitmap: Right
-*form.rotateLeft.width: 36
-*form.rotateLeft.height: 36
-*form.rotateLeft.fromVert: left
-*form.rotateLeft.bitmap: RotateLeft
-*form.down.width: 36
-*form.down.height: 36
-*form.down.fromVert: fold
-*form.down.fromHoriz: rotateLeft
-*form.down.bitmap: Down
-*form.rotateRight.width: 36
-*form.rotateRight.height: 36
-*form.rotateRight.fromVert: right
-*form.rotateRight.fromHoriz: down
-*form.rotateRight.bitmap: RotateRight
-
-*form.point.vertDistance: 10
-*form.point.fromVert: rotateLeft
-*form.point.radioGroup: move
-*form.point.label: Point
-*form.curve.fromVert: point
-*form.curve.radioGroup: point
-*form.curve.label: Curve
-*form.line.fromVert: curve
-*form.line.radioGroup: curve
-*form.line.label: Line
-*form.rectangle.fromVert: line
-*form.rectangle.radioGroup: line
-*form.rectangle.label: Rectangle
-*form.filledRectangle.fromVert: rectangle
-*form.filledRectangle.radioGroup: rectangle
-*form.filledRectangle.label: Filled Rectangle
-*form.circle.fromVert: filledRectangle
-*form.circle.radioGroup: filledRectangle
-*form.circle.label: Circle
-*form.filledCircle.fromVert: circle
-*form.filledCircle.radioGroup: circle
-*form.filledCircle.label: Filled Circle
-*form.floodFill.fromVert: filledCircle
-*form.floodFill.radioGroup: filledCircle
-*form.floodFill.label: Flood Fill
-
-*form.setHotSpot.vertDistance: 10
-*form.setHotSpot.fromVert: floodFill
-*form.setHotSpot.radioGroup: floodFill
-*form.setHotSpot.label: Set Hot Spot
-*form.clearHotSpot.fromVert: setHotSpot
-*form.clearHotSpot.label: Clear Hot Spot
-
-*form.undo.vertDistance: 10
-*form.undo.fromVert: clearHotSpot
-*form.undo.label: Undo
-
-
diff --git a/etc_org/X11/app-defaults/Bitmap-color b/etc_org/X11/app-defaults/Bitmap-color
deleted file mode 100644
index 7a7a025..0000000
--- a/etc_org/X11/app-defaults/Bitmap-color
+++ /dev/null
@@ -1,18 +0,0 @@
-! The App-defaults file for Bitmap on a color screen.
-
-#include "Bitmap"
-
-*background: medium blue
-*foreground: cyan
-*borderColor: plum
-*frame: deep sky blue
-*highlight: magenta
-*Command.background: purple
-*Toggle.background: purple
-*MenuButton.background: purple
-*Command.foreground: white
-*Toggle.foreground: white
-*MenuButton.foreground: white
-*status.foreground: green
-*Dialog.icon.foreground: pale green
-*bitmap.stippled: off
diff --git a/etc_org/X11/app-defaults/Bitmap-nocase b/etc_org/X11/app-defaults/Bitmap-nocase
deleted file mode 100644
index bcd4c4c..0000000
--- a/etc_org/X11/app-defaults/Bitmap-nocase
+++ /dev/null
@@ -1,231 +0,0 @@
-!
-!
-! The App-defaults file for Bitmap for use on file systems
-! that are not case sensitive.
-
-*TransientShell.allowShellResize: True
-*shapeStyle: oval
-*cursor: left_ptr
-*pane.orientation: horizontal
-
-*Form*top: ChainTop
-*Form*bottom: ChainTop
-*Form*left: ChainLeft
-*Form*right: ChainLeft
-
-*MenuButton.leftBitmap: menu12
-*form*width: 120
-*form*height: 15
-
-*baseTranslations:#override\
- Ctrlc: do-quit()\n\
- q: do-quit()\n\
- Ctrln: do-new()\n\
- Ctrlf: do-load()\n\
- Ctrli: do-insert()\n\
- Ctrls: do-save()\n\
- Ctrlw: do-save-as()\n\
- Ctrlr: do-resize()\n\
- Ctrlx: do-rescale()\n\
- Ctrle: do-filename()\n\
- Ctrlb: do-basename()\n\
- Metai: switch-image()\n\
- Metag: switch-grid()\n\
- Metad: switch-dashed()\n\
- Metaa: switch-axes()\n\
- Metas: switch-stippled()\n\
- Metap: switch-proportional()\n\
- Metaz: switch-zoom()\n\
- Metac: do-cut()\n\
- Metaw: do-copy()\n\
- Metay: do-paste()
-
-
-*Toggle.translations: : highlight(WhenUnset)\n\
- : unhighlight()\n\
- ,: set() notify()
-
-*MenuButton.translations:: highlight()\n\
- : reset()\n\
- Any: reset() fix-menu() PopupMenu()
-
-*Dialog*baseTranslations:#override\
- Return: set-dialog-button(okay, yes, retry)\n\
- Ctrlg: set-dialog-button(cancel, abort)
-*image*baseTranslations:#override\
- ,: switch-image()
-*image*width: 0
-*image*height: 0
-*image*Label.internalWidth: 0
-*image*Label.internalHeight: 0
-*image*normalImage.foreground: white
-*image*normalImage.background: black
-*image*invertedImage.foreground: black
-*image*invertedImage.background: white
-
-*bitmap.cursor: tcross
-*bitmap.dashes: Dashes
-*bitmap.stipple: Stippler
-*bitmap.stippled: on
-
-*TransientShell.width: 300
-
-*input*icon: Term
-*qsave*icon: Term
-*error*icon: Excl
-*Dialog.yes.label: Yes
-*Dialog.no.label: No
-*Dialog.okay.label: OK
-*Dialog.abort.label: Abort
-*Dialog.cancel.label: Cancel
-*Dialog.retry.label: Retry
-
-*MenuButton.width: 58
-
-*SimpleMenu.width: 0
-*SimpleMenu.height: 0
-*SimpleMenu.cursor: hand2
-*SimpleMenu.line.height: 0
-
-*fileButton.label: File
-*fileButton.menuName: fileMenu
-
-*editButton.label: Edit
-*editButton.fromHoriz: fileButton
-*editButton.menuName: editMenu
-
-*formy.status*top: ChainTop
-*formy.status*bottom: ChainTop
-*formy.status*left: ChainLeft
-*formy.status*right: ChainRight
-*status.fromHoriz: editButton
-*status.borderWidth: 0
-
-*SmeBSB.HorizontalMargins: 32
-
-*fileMenu.new.label: New (Ctrl-N)...
-*fileMenu.load.label: Load (Ctrl-F)...
-*fileMenu.insert.label: Insert (Ctrl-I)...
-*fileMenu.save.label: Save (Ctrl-S)
-*fileMenu.saveAs.label: Save As (Ctrl-W)...
-*fileMenu.resize.label: Resize (Ctrl-R)...
-*fileMenu.rescale.label: Rescale (Ctrl-X)...
-*fileMenu.filename.label: Filename (Ctrl-E)...
-*fileMenu.basename.label: Basename (Ctrl-B)...
-*fileMenu.quit.label: Quit (Ctrl-C, Q)
-
-*editMenu.image.label: Image (Meta-I)
-*editMenu.grid.label: Grid (Meta-G)
-*editMenu.dashed.label: Dashed (Meta-D)
-*editMenu.axes.label: Axes (Meta-A)
-*editMenu.stippled.label: Stippled (Meta-S)
-*editMenu.proportional.label: Proportional (Meta-P)
-*editMenu.zoom.label: Zoom (Meta-Z)
-*editMenu.cut.label: Cut (Meta-C)
-*editMenu.copy.label: Copy (Meta-W)
-*editMenu.paste.label: Paste (Meta-Y, Ctrl-mb)
-
-*form.clear.label: Clear
-*form.set.fromVert: clear
-*form.set.label: Set
-*form.invert.fromVert: set
-*form.invert.label: Invert
-
-*form.mark.vertDistance: 10
-*form.mark.fromVert: invert
-*form.mark.label: Mark
-*form.unmark.fromVert: mark
-*form.unmark.label: Unmark
-
-*form.copy.vertDistance: 10
-*form.copy.fromVert: unmark
-*form.copy.radioGroup: mark
-*form.copy.label: Copy
-*form.move.fromVert: copy
-*form.move.radioGroup: copy
-*form.move.label: Move
-
-*form.flipHoriz.vertDistance: 10
-*form.flipHoriz.width: 36
-*form.flipHoriz.height: 36
-*form.flipHoriz.fromVert: move
-*form.flipHoriz.bitmap: FlipHoriz
-*form.up.vertDistance: 10
-*form.up.width: 36
-*form.up.height: 36
-*form.up.fromVert: move
-*form.up.fromHoriz: flipHoriz
-*form.up.bitmap: Up
-*form.flipVert.vertDistance: 10
-*form.flipVert.width: 36
-*form.flipVert.height: 36
-*form.flipVert.fromVert: move
-*form.flipVert.fromHoriz: up
-*form.flipVert.bitmap: FlipVert
-*form.left.width: 36
-*form.left.height: 36
-*form.left.fromVert: flipHoriz
-*form.left.bitmap: Left
-*form.fold.width: 36
-*form.fold.height: 36
-*form.fold.fromVert: up
-*form.fold.fromHoriz: left
-*form.fold.bitmap: Fold
-*form.right.width: 36
-*form.right.height: 36
-*form.right.fromVert: flipVert
-*form.right.fromHoriz: fold
-*form.right.bitmap: Right
-*form.rotateLeft.width: 36
-*form.rotateLeft.height: 36
-*form.rotateLeft.fromVert: left
-*form.rotateLeft.bitmap: RotateLeft
-*form.down.width: 36
-*form.down.height: 36
-*form.down.fromVert: fold
-*form.down.fromHoriz: rotateLeft
-*form.down.bitmap: Down
-*form.rotateRight.width: 36
-*form.rotateRight.height: 36
-*form.rotateRight.fromVert: right
-*form.rotateRight.fromHoriz: down
-*form.rotateRight.bitmap: RotateRight
-
-*form.point.vertDistance: 10
-*form.point.fromVert: rotateLeft
-*form.point.radioGroup: move
-*form.point.label: Point
-*form.curve.fromVert: point
-*form.curve.radioGroup: point
-*form.curve.label: Curve
-*form.line.fromVert: curve
-*form.line.radioGroup: curve
-*form.line.label: Line
-*form.rectangle.fromVert: line
-*form.rectangle.radioGroup: line
-*form.rectangle.label: Rectangle
-*form.filledRectangle.fromVert: rectangle
-*form.filledRectangle.radioGroup: rectangle
-*form.filledRectangle.label: Filled Rectangle
-*form.circle.fromVert: filledRectangle
-*form.circle.radioGroup: filledRectangle
-*form.circle.label: Circle
-*form.filledCircle.fromVert: circle
-*form.filledCircle.radioGroup: circle
-*form.filledCircle.label: Filled Circle
-*form.floodFill.fromVert: filledCircle
-*form.floodFill.radioGroup: filledCircle
-*form.floodFill.label: Flood Fill
-
-*form.setHotSpot.vertDistance: 10
-*form.setHotSpot.fromVert: floodFill
-*form.setHotSpot.radioGroup: floodFill
-*form.setHotSpot.label: Set Hot Spot
-*form.clearHotSpot.fromVert: setHotSpot
-*form.clearHotSpot.label: Clear Hot Spot
-
-*form.undo.vertDistance: 10
-*form.undo.fromVert: clearHotSpot
-*form.undo.label: Undo
-
-
diff --git a/etc_org/X11/app-defaults/Clock-color b/etc_org/X11/app-defaults/Clock-color
deleted file mode 100644
index 542ce41..0000000
--- a/etc_org/X11/app-defaults/Clock-color
+++ /dev/null
@@ -1,5 +0,0 @@
-Clock*Background: grey
-Clock*BorderColor: light blue
-Clock*hour: yellow
-Clock*jewel: yellow
-Clock*minute: yellow
diff --git a/etc_org/X11/app-defaults/Editres b/etc_org/X11/app-defaults/Editres
deleted file mode 100644
index 5391949..0000000
--- a/etc_org/X11/app-defaults/Editres
+++ /dev/null
@@ -1,285 +0,0 @@
-! The App-defaults file for Editres.
-
-Editres.Geometry: 500x568
-
-*ShapeStyle: Oval
-*Tree*ShapeStyle: Rectangle
-
-! The rest of this file are either button names, or important for
-! functionality, modifying these values may cause strange program
-! behavior.
-
-*flash.BorderWidth: 0
-
-! Menu Button Names
-
-*Box.commands.Label: Commands
-*Box.treeCommands.Label: Tree
-
-*porthole.tree.width: 500
-*porthole.tree.height: 480
-
-! Universal Menu Entry Names
-*xt.sendTree.Label: Get Tree
-*xt.quit.Label: Quit
-
-*xt.selectAll.Label: Select All
-*xt.unselectAll.Label: Unselect All
-*xt.invertAll.Label: Invert All
-*xt.selectChildren.Label: Select Children
-*xt.selectParent.Label: Select Parent
-*xt.selectDescendants.Label: Select Descendants
-*xt.selectAncestors.Label: Select Ancestors
-
-! Xt Menu Entry Names
-
-*xt.refreshTree.Label: Refresh Current Widget Tree
-*xt.dumpTreeToFile.Label: Dump Widget Tree to a File
-*xt.getResourceList.Label: Show Resource Box
-*xt.setValues.Label: Set Resource
-
-*xt.showClientWidget.Label: Select Widget in Client
-*xt.showWidgetNames.Label: Show Widget Names
-*xt.showClassNames.Label: Show Class Names
-*xt.showWidgetIDs.Label: Show Widget IDs
-*xt.showWidgetWindows.Label: Show Widget Windows
-*xt.flashActiveWidgets.Label: Flash Active Widgets
-
-! InterViews Menu Entry Names
-
-*iv*refreshTree.Label: Refresh Current Style Tree
-*iv*dumpTreeToFile.Label: Dump Style Tree to a File
-*iv*getResourceList.Label: Show Attribute Box
-*iv*setValues.Label: Set Attribute
-
-*iv*showClientWidget.Label: Select Style in Client
-*iv*showWidgetNames.Label: Show Style Names
-*iv*showClassNames.Label: Show Class Names
-*iv*showWidgetIDs.Label: Show Style IDs
-*iv*showWidgetWindows.Label: Show Style Windows
-*iv*flashActiveWidgets.Label: Flash Active Styles
-
-! Universal Toolkit Messages
-
-*label0: Action `%s' must have the Editres Protocol.
-*label1: Action %s's argument must be either `cancel' or `okay'.
-*label2: Action `%s' must have exactly one argument.
-*label3: Unknown parameter to action `%s' must be one of:\n
-*label4: It appears that this client does not understand\nthe Editres Protocol.
-*label5: Can't grab the mouse.\n
-*label6: Click the mouse pointer on any toolkit client.
-*label8: Message sent to client%s.
-*label9: Incorrectly formatted message from client.
-*label10: Unable to own the Resource Editor Command Selection
-*label11: Unknown Error code %d
-*label13: Welcome to the X Resource Editor version 1.1
-*label15: That window does not appear to be\nin the currently displayed client.
-*label16: Editres Internal Error: Unable to FindNode.\n
-*label18: There are no active nodes.
-*label20: ApplyResource: found no matches.
-*label21: Error: SVActiveEntry Action must have exactly one argument.
-*label22: Error: SVActiveEntry Action's first Argument must be either 'Resource' or 'Value'.
-*label24: Unable to open the file `%s' for writing.
-*label25: Error while trying to save Context\nAborting file dialog popup.
-*label26: Error while trying to find Context\nAborting...
-*label28: Loop in tree: node %s's parent (%s) has not been created yet\n
-*label30: There are no active nodes.
-*label31: Internal Error: Unknown select type.
-*label32: Internal Error: Unknown label type.
-*label33: Internal Error: Unknown activate type.
-*label34: Only one Resource Box can be active at a time.
-*label35: Unable to unpack protocol request.
-*label36: This version of editres uses protocol version %s,\nbut the client speaks version %s.
-
-! Xt Messages
-
-*xt*label7: Unable to own the Resource Selection
-*xt*label12: Widget Tree for client %s(%s).
-*xt*label14: Click on any widget in the client.\nEditres will select that widget in the tree display.
-*xt*label17: No widget Tree is avaliable.
-*xt*label19: This function requires exactly one (1) widget to be selected.
-*xt*label23: There are no currently active widgets.
-*xt*label27: There is no widget tree to display.
-*xt*label29: XSaveContext failed on widget %s.
-
-! InterViews Messages
-
-*iv*label7: Unable to own the Attribute Selection
-*iv*label12: Style Tree for client %s(%s).
-*iv*label14: Click on any style in the client.\nEditres will select that style in the tree display.
-*iv*label17: No style Tree is avaliable.
-*iv*label19: This function requires exactly one (1) style to be selected.
-*iv*label23: There are no currently active styles.
-*iv*label27: There is no style tree to display.
-*iv*label29: XSaveContext failed on style %s.
-
-*MenuButton.leftBitmap: menu10
-
-! For the Top Area
-
-*hPane.orientation: horizontal
-*hPane.preferredPaneSize: 100
-*hPane.Panner.width: 100
-*hPane.Panner.height: 100
-*hPane.Panner.preferredPaneSize: 100
-*Paned.Panner.showGrip: False
-*Paned.box.showGrip: False
-*Paned.hPane.showGrip: True
-
-! For the Filename popup dialog.
-
-*fileDialog*value:
-*fileDialog*allowShellResize: True
-*fileDialog*Text.baseTranslations: #override \n\
- Return: PopdownFileDialog(okay)
-
-
-! Universal Resources for the Resource Box.
-
-*mainViewport*resourceLabel.font: \
--*-new century schoolbook-bold-r-*-*-14-*-*-*-*-*-*-*
-*allowShellResize: True
-*resourceLabel.allowResize: True
-*List.verticalList: True
-*namesAndClasses*BorderWidth: 0
-*star.Label: *
-*dot.Label: .
-*namesLabel.font: \
--*-new century schoolbook-bold-r-*-*-14-*-*-*-*-*-*-*
-*constraintLabel.font: \
--*-new century schoolbook-bold-r-*-*-14-*-*-*-*-*-*-*
-*valueLabel.BorderWidth: 0
-*valueForm*preferredPaneSize: 40
-*valueForm*min: 28
-*valueText*editType: edit
-*valueText.Scroll: WhenNeeded
-*valueText.width: 297
-*setValuesPopup*resourceText.width: 297
-*setFile.Label: Set Save File
-*save.Label: Save
-*apply.Label: Apply
-*saveAndApply.Label: Save and Apply
-*commandBox.show.Label: Show
-*commandBox.min: 28
-
-! InterViews Resources for the Resource Box.
-
-*iv*single.Label: Any Style
-*iv*any.Label: Any Style Chain
-*iv*namesLabel.Label: Normal Attributes: mb2 gets a value
-*iv*constraintLabel.Label: Constraint Attributes
-*iv*valueLabel.Label: Enter Attribute Value:
-*iv*commandBox.cancel.Label: Popdown Attribute Box
-
-! Xt Resources for the Resource Box.
-
-*xt*single.Label: ?
-*xt*any.Label: *
-*xt*namesLabel.Label: Normal Resources: mb2 gets a value
-*xt*constraintLabel.Label: Constraint Resources
-*xt*valueLabel.Label: Enter Resource Value:
-*xt*commandBox.cancel.Label: Popdown Resource Box
-
-! This gives us an exactly one of many toggle, if toggle is
-! not set in each group the application will probabally core dump.
-
-*namesAndClasses*Toggle.baseTranslations: #override \n\
- ,: set() notify()
-
-
-*commandBox.skipAdjust: True
-
-! Get resource values action binding.
-
-*List.baseTranslations: #override \n\
- ,: Set() EnableGetVal() Notify()
-
-! Keyboard Actions for Tree and children of the Tree.
-
-*Tree.baseTranslations: #override \n\
- :space: Select(nothing) \n\
- :w: Select(widget) \n\
- :s: Select(all) \n\
- :i: Select(invert) \n\
- :c: Select(children) \n\
- :d: Select(descendants) \n\
- :p: Select(parent) \n\
- :a: Select(ancestors) \n\
- :N: Relabel(name) \n\
- :C: Relabel(class) \n\
- :I: Relabel(id) \n\
- :W: Relabel(window)
-
-*Tree.Toggle.baseTranslations: #override \n\
- :space: Select(nothing) \n\
- :w: Select(widget) \n\
- :s: Select(all) \n\
- :i: Select(invert) \n\
- :c: Select(children) \n\
- :d: Select(descendants) \n\
- :p: Select(parent) \n\
- :a: Select(ancestors) \n\
- :N: Relabel(name) \n\
- :C: Relabel(class) \n\
- :I: Relabel(id) \n\
- :W: Relabel(window) \n\
- ,: Select(nothing) toggle() notify() \n\
- ,: Relabel(toggle)
-
-! For the SetValues popup
-
-*setValuesPopup.form.?.resizable: True
-*setValuesPopup.form.?.left: ChainLeft
-*setValuesPopup.form.?.right: ChainLeft
-
-*setValuesPopup.form.label.Label: Use to Change Fields.
-*setValuesPopup.form.Label.BorderWidth: 0
-
-*xt*setValuesPopup.form.resourceLabel.Label: Resource Name:
-*xt*setValuesPopup.form.resourceLabel.width: 114
-*xt*setValuesPopup.form.resourceLabel.justify: right
-*xt*setValuesPopup.form.valueLabel.Label: Resource Value:
-*xt*setValuesPopup.form.valueLabel.width: 114
-*xt*setValuesPopup.form.setValues.Label: Apply
-*xt*setValuesPopup.form.cancel.Label: Cancel
-
-*setValuesPopup.form.Text.?.EditType: Edit
-*setValuesPopup.form.Text.resize: Width
-
-*setValuesPopup.form.resourceText.baseTranslations: #override \
- Return: no-op(RingBell) \n\
- Ctrlq,Tab: insert-char() \n\
- : select-start() SVActiveEntry(Resource) \n\
- Tab: SVActiveEntry(Value)
-
-*setValuesPopup.form.valueText.baseTranslations: #override \
- Return: no-op(RingBell) \n\
- Ctrlq,Tab: insert-char() \n\
- : select-start() SVActiveEntry(Value)\n\
- Tab: SVActiveEntry(Resource)
-
-*Text.translations: #override \
- mI: no-op(r)\n\
- cS: no-op(r)\n\
- cR: no-op(r)\n\
- Escape: no-op()
-
-*fileDialog.?.Text.width: 280
-
-! New resource settings
-*normalViewport.min: 19
-*normalViewport.allowVert: True
-*constraintViewport.min: 19
-*constraintViewport.allowVert: True
-*mainViewport.allowHoriz: True
-*mainViewport.pane.namesAndClasses.defaultDistance: 0
-*mainViewport.useBottom: True
-*mainViewport.pane.Label.min: 22
-*mainViewport.pane.Label.max: 22
-*mainViewport.pane.Form.showGrip: False
-*mainViewport.pane.Label.showGrip: False
-*mainViewport.pane.Form.min: 66
-*mainViewport.pane.Form.max: 66
-*tree*TransientShell.translations: #override \
-