ALTER TABLE `config_cfg`
MODIFY `cfg_type` ENUM('text','number','date','boolean','textarea','json','choice', 'country') NOT NULL default 'text';

INSERT IGNORE INTO `config_cfg` (`cfg_id`, `cfg_name`, `cfg_value`, `cfg_type`, `cfg_default`, `cfg_tooltip`, `cfg_section`) VALUES
(1047, 'sChurchCountry', 'United States', 'country', '', 'Church Country', 'ChurchInfoReport');

alter table user_usr drop column `usr_BaseFontSize`;
alter table user_usr drop column `usr_Communication`;
alter table user_usr drop column `usr_Workspacewidth`;

ALTER TABLE `user_usr`
CHANGE COLUMN `usr_NeedPasswordChange` `usr_NeedPasswordChange` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1' COMMENT '' ,
CHANGE COLUMN `usr_UserName` `usr_UserName` VARCHAR(50) CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NOT NULL COMMENT '',
CHANGE COLUMN `usr_AddRecords` `usr_AddRecords` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0' COMMENT '' ,
CHANGE COLUMN `usr_EditRecords` `usr_EditRecords` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0' COMMENT '' ,
CHANGE COLUMN `usr_DeleteRecords` `usr_DeleteRecords` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0' COMMENT '' ,
CHANGE COLUMN `usr_MenuOptions` `usr_MenuOptions` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0' COMMENT '' ,
CHANGE COLUMN `usr_EditSelf` `usr_EditSelf` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0' COMMENT '' ,
CHANGE COLUMN `usr_ManageGroups` `usr_ManageGroups` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0' COMMENT '' ,
CHANGE COLUMN `usr_Finance` `usr_Finance` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0' COMMENT '' ,
CHANGE COLUMN `usr_Admin` `usr_Admin` TINYINT(1) UNSIGNED NOT NULL DEFAULT '0' COMMENT '' ;

