Update calc style. Move keys. Add theme testing