Added f theme
various changes