Add hover setting, minor setting rework