Squashed 'wicker/' changes from 9c6a79c..e5f91c0

e5f91c0 plugin rearrangement; moved stuff from U&A

git-subtree-dir: wicker
git-subtree-split: e5f91c0709cf40e2dcb5ff5961ee4b5639cf9188
Moved some stuff to wicker, minor overall tweaks/improvements.
Squashed 'wicker/' changes from e5f91c0..6a10af5

6a10af5 fixed minor bug with initialisation order

git-subtree-dir: wicker
git-subtree-split: 6a10af534b0ddbb4708fde158af0334c2b99cddd
(YAWBF) tiny detail not worth mentioning
The actual tweaks/improvements as mentioned before
Simple merge.