i3: merge changes from main conf.