refactor old flash theme