Theme step on step A and C update 1