Adjusted internal structures to follow custom color settings