Make compatible with management app; remove theme