Migrated more stuff to Makerspace theme