Add & import comments and improve theme