some more tweaks to theme taken from XXMrHyde

Change-Id: I2ca57ff975cef5e645187e010fe7e2292cb0d6a4