* Update to new neobundle style