initial theme implementations
fixing conflicts