master: update theme settings and gitm adjustment