first commit after generalizing theme a bit
more cleanup for share