Issue #3 rethemed demos 02 and 03