Merge "Switch theme and add report issue"