Refactoring of selrvlet clases and theme