Bootstrap reorganization and theme