fix theme colors & ui issues