Added framework file, updated charset and lang