Feature/tw 35 server settings