Rearrange part 1
Continue making new filter categories
New effects and re-arrange are looking just about finished.