layouts are revised and text color can be changed by theme