major update - most menus work, theme matches okay