Some bugfixes & color changes