Remove code from the arrow theme and make modules for it