Extended configuration. Added Theme management.