win: category switches done
win: refactoring