fixing small bugs in the refactored CSS, returning to original theme