Final Update

The theme code is not implemented