Greatly improve kde support