psxXtras and Settings now have only one branch

easier to maintain and we don't need two branches here