new database, / new xaml
Revert "new database, / new xaml"

This reverts commit 0de0c5ed9b0a803df73f703d6b612f331fa4c1dc.