android theme colour, reorganisation