Move keys into own file, consolodate theme code