Upgrade to FM12 themes and major tidy up.

Added resolution field and GPS location field.