Range of updates to try get theme to recognize regions properly

Signed-off-by: Gregg Coppen <gregg@iaminawe.com>