Restructure and update colors