Multiple custom themes 2/n

Add an id to custom themes to allow deletion/edition
independent of names, and add better handling of theme name
in preparation for naming step.

Bug: 132257073
Change-Id: If4118688497a675544a7d04857b7bbb6ec57e7d4