Convert to JSON db to File based database
merge fix
gw-8 branch fixes, theme selection.
theme selection settings modification.