Theme externalid refactor