i3-config and a lot of small changes
merge