Working systray

Once the xcffib changes are in. This basically changes the values back to those in develop (doh!).