Update colors and move code to module instead of form