purgetss 3.0.4 → 3.1.2

package/index.js

@@ -45,10 +45,11 @@ const destConfigJSFile = cwd + '/purgetss/config.js';
 const srcLibLI = path.resolve(__dirname, './dist/lineicons.js');
 const srcLibBX = path.resolve(__dirname, './dist/boxicons.js');
 const srcLibF7 = path.resolve(__dirname, './dist/framework7icons.js');
-const srcLibTi = path.resolve(__dirname, './dist/tablericons.js');
-const srcPurgeTSSLibrary = path.resolve(__dirname, './dist/purgetss.ui.js');
+const srcLibTI = path.resolve(__dirname, './dist/tablericons.js');
 const srcLibFA = path.resolve(__dirname, './dist/fontawesome.js');
 const srcLibMD = path.resolve(__dirname, './dist/materialdesignicons.js');
+const srcLibBI = path.resolve(__dirname, './dist/bootstrapicons.js');
+const srcPurgeTSSLibrary = path.resolve(__dirname, './dist/purgetss.ui.js');
 
 //
 const customTailwindFile = cwd + '/purgetss/tailwind.tss';
@@ -90,13 +91,16 @@ const srcFontAwesomeBetaFontFamilies = {
 const srcFontsFolder = path.resolve(__dirname, './assets/fonts');
 const srcResetTSSFile = path.resolve(__dirname, './dist/reset.tss');
 const srcJMKFile = path.resolve(__dirname, './lib/templates/alloy.jmk');
+
+const srcBoxIconsFontTSSFile = path.resolve(__dirname, './dist/boxicons.tss');
 const srcFontAwesomeTSSFile = path.resolve(__dirname, './dist/fontawesome.tss');
 const srcLineiconsFontTSSFile = path.resolve(__dirname, './dist/lineicons.tss');
-const srcBoxIconsFontTSSFile = path.resolve(__dirname, './dist/boxicons.tss');
-const srcFramework7FontTSSFile = path.resolve(__dirname, './dist/framework7icons.tss');
 const srcTablerIconsFontTSSFile = path.resolve(__dirname, './dist/tablericons.tss');
-const srcPurgetssConfigFile = path.resolve(__dirname, './lib/templates/purgetss.config.js');
+const srcFramework7FontTSSFile = path.resolve(__dirname, './dist/framework7icons.tss');
 const srcMaterialDesignIconsTSSFile = path.resolve(__dirname, './dist/materialdesignicons.tss');
+const srcBootstrapIconsFontTSSFile = path.resolve(__dirname, './dist/bootstrapicons.tss');
+
+const srcPurgetssConfigFile = path.resolve(__dirname, './lib/templates/purgetss.config.js');
 //
 
 //! Interfase
@@ -138,6 +142,7 @@ function copyFonts(options) {
 			copyFont('bx');
 			copyFont('f7');
 			copyFont('ti');
+			copyFont('bi');
 		}
 
 		if (options.modules) {
@@ -164,6 +169,7 @@ function copyFontLibraries(options) {
 			copyFontLibrary('bx');
 			copyFontLibrary('f7');
 			copyFontLibrary('ti');
+			copyFontLibrary('bi');
 		}
 	}
 }
@@ -222,6 +228,8 @@ function purgeClasses(options) {
 
 		tempPurged += purgeTablerIcons(uniqueClasses, cleanUniqueClasses);
 
+		tempPurged += purgeBootstrapIcons(uniqueClasses, cleanUniqueClasses);
+
 		saveFile(destAppTSSFile, tempPurged);
 
 		logger.file('app.tss');
@@ -259,68 +267,80 @@ module.exports.init = init;
 
 //! Command: create
 function create(args, options) {
+	start();
 	const { exec } = require("child_process");
 	const commandExistsSync = require('command-exists').sync;
 
-	logger.info('Creating a new Titanium Project with `PurgeTSS`...');
-
-	exec(`ti config app.idprefix && ti config app.workspace`, (error, stdout, stderr) => {
-		if (error) {
-			return logger.error(error);
-		}
-
-		// if (stderr) {
-		// 	return logger.warn(stderr);
-		// }
+	exec(`ti config app.idprefix && ti config app.workspace`, (error, stdout) => {
 
 		let results = stdout.split('\n');
-
 		let idPrefix = results[0];
 		let workspace = results[1];
 
-		if (idPrefix && workspace) {
-			let theIDPrefix = `${idPrefix}.${args.name.replace(/ /g, '').replace(/_/g, '').toLowerCase()}`;
+		// if (error) return logger.error(error);
 
-			let tiCreateCommand = `ti create -t app -p all -n "${args.name}" --no-prompt --id ${theIDPrefix}`;
+		if (idPrefix !== 'app.idprefix not found' && workspace !== '') {
+			console.log('');
+			logger.info('Creating a new Titanium project');
 
-			exec(tiCreateCommand, (error, stdout, stderr) => {
-				if (error) {
-					return logger.error(error);
-				}
+			let theIDPrefix = `${idPrefix}.${args.name.replace(/ /g, '').replace(/-/g, '').replace(/_/g, '').toLowerCase()}`;
+
+			let tiCreateCommand = `ti create -t app -p all -n "${args.name}" --no-prompt --id ${theIDPrefix}`;
 
-				// if (stderr) {
-				// 	return logger.warn(stderr);
-				// }
+			exec(tiCreateCommand, (error) => {
+				if (error) return logger.error(error);
 
-				logger.info(stdout);
+				let fonts = (options.vendor) ? `&& purgetss f -m -v=${options.vendor}` : '';
 
-				let theOpenCommand;
-				// returns true/false; doesn't throw
-				if (commandExistsSync('code')) {
-					theOpenCommand = 'code .';
-				} else if (commandExistsSync('subl')) {
-					theOpenCommand = 'subl .';
-				} else {
-					theOpenCommand = 'open .';
+				if (options.vendor) {
+					logger.info('Installing requested fonts');
 				}
 
-				let fonts = (options.vendor) ? `&& purgetss f -m -v=${options.vendor}` : '';
-				let cdToProject = `cd ${workspace}/"${args.name}" && alloy new && purgetss w && purgetss b ${fonts} && ${theOpenCommand}`;
+				let cdToProject = `cd ${workspace}/"${args.name}" && alloy new && purgetss w && purgetss b ${fonts}`;
 
-				exec(cdToProject, (error, stdout, stderr) => {
-					if (error) {
-						return logger.error(error);
+				exec(cdToProject, (error) => {
+					if (error) return logger.error(error);
+
+					let theOpenCommand;
+					if (commandExistsSync('code')) {
+						theOpenCommand = `cd ${workspace}/"${args.name}" && code .`;
+					} else if (commandExistsSync('subl')) {
+						theOpenCommand = `cd ${workspace}/"${args.name}" && subl .`;
+					} else {
+						theOpenCommand = `cd ${workspace}/"${args.name}" && open .`;
 					}
 
-					// if (stderr) {
-					// 	return logger.warn(stderr);
-					// }
+					if (options.tailwind) {
+						logger.info('Installing Tailwind CSS');
+
+						let installTailwind = `cd ${workspace}/"${args.name}" && npm init -y && npm i tailwindcss -D && npx tailwindcss init`;
+
+						exec(installTailwind, (error) => {
+							if (error) return logger.error(error);
+
+							finish(chalk.yellow(`‘${args.name}’`) + ' project created successfully in');
 
-					logger.info(stdout);
+							exec(theOpenCommand, (error) => {
+								if (error) return logger.error(error);
+							});
+						});
+					} else {
+						finish(chalk.yellow(`‘${args.name}’`) + ' project created successfully in');
+
+						exec(theOpenCommand, (error) => {
+							if (error) return logger.error(error);
+						});
+					}
 				});
 			});
 		} else {
-			return logger.error('You need to have `app.idprefix` and `app.workspace` configure in `ti config` to create an App with `PurgeTSS`.');
+			console.log('');
+			logger.error('::Can’t create a Titanium project::');
+			logger.info('You need to have', chalk.green('`app.idprefix`'), 'and', chalk.green('`app.workspace`'), 'configured to create a Project with', chalk.green('`PurgeTSS`'));
+			console.log('');
+			logger.info('Please, set them like this:');
+			logger.info(chalk.green('ti config app.idprefix'), chalk.yellow("'com.your.reverse.domain'"));
+			logger.info(chalk.green('ti config app.workspace'), chalk.yellow("'path/to/your/workspace/directory'"));
 		}
 	});
 }
@@ -491,6 +511,12 @@ function copyTablerIconsFonts() {
 	logger.info('tabler-icons Font copied to', chalk.yellow('./app/assets/fonts'), 'folder');
 }
 
+function copyBootstrapIconsFonts() {
+	// Bootstrap Icons Font
+	copyFile(srcFontsFolder + '/bootstrap-icons.ttf', 'bootstrap-icons.ttf');
+	logger.info('bootstrap-icons Font copied to', chalk.yellow('./app/assets/fonts'), 'folder');
+}
+
 function processFontawesomeStyles(data) {
 	let convertedTSSClasses = '';
 
@@ -701,18 +727,17 @@ function buildCustomTailwind(message = 'file created!') {
 	delete defaultColors.trueGray;
 	delete defaultColors.warmGray;
 
-	if (!configFile.theme.extend) {
-		configFile.theme.extend = {};
-	}
+	// !Prepare values
+	configFile.theme.extend = configFile.theme.extend ?? {};
 
 	let allWidthsCombined = (configFile.theme.spacing) ? { ...{ full: '100%', auto: '', screen: '' }, ...configFile.theme.spacing } : { ...defaultTheme.width({ theme: () => (defaultTheme.spacing) }) };
 	let allHeightsCombined = (configFile.theme.spacing) ? { ...{ full: '100%', auto: '', screen: '' }, ...configFile.theme.spacing } : defaultTheme.height({ theme: () => (defaultTheme.spacing) });
 
 	let overwritten = {
-		colors: (configFile.theme.colors) ? configFile.theme.colors : { transparent: 'transparent', ...defaultColors },
-		spacing: (configFile.theme.spacing) ? configFile.theme.spacing : { ...defaultTheme.spacing },
-		width: (configFile.theme.width) ? configFile.theme.width : allWidthsCombined,
-		height: (configFile.theme.height) ? configFile.theme.height : allHeightsCombined
+		width: configFile.theme.width ?? allWidthsCombined,
+		height: configFile.theme.height ?? allHeightsCombined,
+		spacing: configFile.theme.spacing ?? { ...defaultTheme.spacing },
+		colors: configFile.theme.colors ?? { transparent: 'transparent', ...defaultColors },
 	}
 
 	let base = {
@@ -754,33 +779,9 @@ function buildCustomTailwind(message = 'file created!') {
 		configFile.theme['Window'] = _.merge({ default: { backgroundColor: '#ffffff' } }, configFile.theme.Window);
 	}
 
-	configFile.theme.textColor = combineKeys(configFile.theme, base.colors, 'textColor', true);
-
-	configFile.theme.backgroundColor = combineKeys(configFile.theme, base.colors, 'backgroundColor', true);
-
-	configFile.theme.backgroundSelectedColor = combineKeys(configFile.theme, base.colors, 'backgroundSelectedColor', true);
-
-	configFile.theme.barColor = combineKeys(configFile.theme, base.colors, 'barColor', true);
-	configFile.theme.navTintColor = combineKeys(configFile.theme, base.colors, 'navTintColor', true);
-	configFile.theme.tabsBackgroundColor = combineKeys(configFile.theme, base.colors, 'tabsBackgroundColor', true);
-	configFile.theme.titleColor = combineKeys(configFile.theme, base.colors, 'titleColor', true);
-	configFile.theme.activeTintColor = combineKeys(configFile.theme, base.colors, 'activeTintColor', true);
-	configFile.theme.activeTitleColor = combineKeys(configFile.theme, base.colors, 'activeTitleColor', true);
-
-	configFile.theme.borderColor = combineKeys(configFile.theme, base.colors, 'borderColor', true);
-
-	configFile.theme.pagingControlAlpha = (configFile.theme.opacity) ? _.merge(configFile.theme.opacity, configFile.theme.extend.opacity) : _.merge(defaultTheme.opacity, configFile.theme.extend.opacity);
-
-	configFile.theme.pagingControlTimeout = { ...defaultTheme.transitionDelay, ...configFile.theme.transitionDelay, ...configFile.theme.extend.transitionDelay };
-
-	configFile.theme.pagingControlColor = combineKeys(configFile.theme, base.colors, 'pagingControlColor', true);
-
-	configFile.theme.pageIndicatorColor = combineKeys(configFile.theme, base.colors, 'pageIndicatorColor', true);
-
-	configFile.theme.currentPageIndicatorColor = combineKeys(configFile.theme, base.colors, 'currentPageIndicatorColor', true);
-
-	configFile.theme.cacheSize = {};
+	let defaultBorderRadius = (configFile.theme.spacing || configFile.theme.borderRadius) ? {} : { ...defaultTheme.borderRadius, ...base.spacing };
 
+	// Some clean up
 	// pagingControlHeight
 	delete base.height['fit'];
 	delete base.height['max'];
@@ -788,116 +789,174 @@ function buildCustomTailwind(message = 'file created!') {
 	delete base.height['min-content'];
 	delete base.height['max-content'];
 
-	configFile.theme.pagingControlHeight = base.height;
-
-	configFile.theme.placeholderColor = combineKeys(configFile.theme, base.colors, 'placeholderColor', true);
-
-	configFile.theme.touchFeedbackColor = combineKeys(configFile.theme, base.colors, 'touchFeedbackColor', true);
-
-	configFile.theme.gradientColorStops = combineKeys(configFile.theme, base.colors, 'gradientColorStops', true);
-
-	configFile.theme.linearGradient = {};
-	configFile.theme.radialGradient = {};
-
-	configFile.theme.placement = {};
-
-	configFile.theme.fontSize = combineKeys(configFile.theme, defaultTheme.fontSize, 'fontSize', false);
-
-	configFile.theme.fontStyle = {};
-
-	configFile.theme.fontWeight = combineKeys(configFile.theme, defaultTheme.fontWeight, 'fontWeight', true);
-
-	configFile.theme.fontFamily = combineKeys(configFile.theme, {}, 'fontFamily', false);
-
-	if (!Object.keys(configFile.theme.fontFamily).length) {
-		delete configFile.theme.fontFamily;
-	}
-
-	configFile.theme.gaps = combineKeys(configFile.theme, base.spacing, 'margin', true);
-
-	configFile.theme.gridFlow = {};
-
-	configFile.theme.gridSystem = {};
-
-	configFile.theme.gridColumnsStartEnd = {};
-
-	configFile.theme.textAlign = {};
+	// !Core Properties
+
+	// !Combine `key` values from configFile.theme with base.values or with default.values to generate classes
+
+	// Android Specific
+	configFile.theme.activeIconIsMask = {};
+	configFile.theme.activeTintColor = combineKeys(configFile.theme, base.colors, 'activeTintColor');
+	configFile.theme.activeTitleColor = combineKeys(configFile.theme, base.colors, 'activeTitleColor');
+	configFile.theme.activityEnterTransition = {};
+	configFile.theme.activityExitTransition = {};
+	configFile.theme.activityIndicatorStyle = {};
+	configFile.theme.activityReenterTransition = {};
+	configFile.theme.activityReturnTransition = {};
+	configFile.theme.activitySharedElementEnterTransition = {};
+	configFile.theme.activitySharedElementExitTransition = {};
+	configFile.theme.activitySharedElementReenterTransition = {};
+	configFile.theme.activitySharedElementReturnTransition = {};
+	configFile.theme.allowUserCustomization = {};
+	configFile.theme.autoAdjustScrollViewInsets = {};
 	configFile.theme.autocapitalization = {};
-	configFile.theme.keyboardAppearance = {};
-	configFile.theme.keyboardType = {};
+	configFile.theme.autocorrect = {};
+	configFile.theme.autofillType = {};
 	configFile.theme.autoLink = {};
+	configFile.theme.autoreverse = {};
+	configFile.theme.backgroundBlendMode = {};
+	configFile.theme.backgroundColor = combineKeys(configFile.theme, base.colors, 'backgroundColor');
+	configFile.theme.backgroundLinearGradient = {};
+	configFile.theme.backgroundRadialGradient = {};
+	configFile.theme.backgroundSelectedColor = combineKeys(configFile.theme, base.colors, 'backgroundSelectedColor');
+	configFile.theme.barColor = combineKeys(configFile.theme, base.colors, 'barColor');
+	configFile.theme.barTitleColor = combineKeys(configFile.theme, base.colors, 'barTitleColor');
+	configFile.theme.barTitleShadow = {};
+	configFile.theme.barTitleShadowColor = combineKeys(configFile.theme, base.colors, 'barTitleShadowColor');;
+	configFile.theme.borderColor = combineKeys(configFile.theme, base.colors, 'borderColor');
+	configFile.theme.borderRadiusExtraStyles = combineKeys(configFile.theme, _.merge(defaultBorderRadius, configFile.theme.spacing, configFile.theme.extend.spacing), 'borderRadius');
 	configFile.theme.borderStyle = {};
+	configFile.theme.borderWidth = combineKeys(configFile.theme, defaultTheme.borderWidth, 'borderWidth');
+	configFile.theme.bottomNavigation = combineKeys(configFile.theme, base.spacing, 'bottomNavigation');
+	configFile.theme.bubbleParent = {};
+	configFile.theme.cacheSize = {};
+	configFile.theme.clipMode = {};
+	configFile.theme.currentPageIndicatorColor = combineKeys(configFile.theme, base.colors, 'currentPageIndicatorColor');
+	configFile.theme.disableBounce = {};
+	configFile.theme.displayCaps = {};
+	configFile.theme.displayUtilities = {};
+	configFile.theme.draggingConstraints = {};
+	configFile.theme.draggingType = {};
+	configFile.theme.dropShadow = {};
+	configFile.theme.dropShadowColor = combineKeys(configFile.theme, base.colors, 'dropShadowColor');
 	configFile.theme.editable = {};
 	configFile.theme.ellipsize = {};
 	configFile.theme.enableCopy = {};
 	configFile.theme.enableReturnKey = {};
+	configFile.theme.exitOnClose = {};
 	configFile.theme.extendBackground = {};
-	configFile.theme.returnKeyType = {};
-	configFile.theme.autocorrect = {};
-	configFile.theme.autofillType = {};
-	configFile.theme.showCancel = {};
-
-	configFile.theme.verticalAlignment = {};
-	configFile.theme.scrollableRegion = {};
-	configFile.theme.scrollIndicators = {};
-	configFile.theme.tintColor = combineKeys(configFile.theme, base.colors, 'tintColor', true);
-
-	let defaultBorderRadius = (configFile.theme.spacing || configFile.theme.borderRadius) ? {} : { ...defaultTheme.borderRadius, ...base.spacing };
-	configFile.theme.borderRadiusExtraStyles = combineKeys(configFile.theme, _.merge(defaultBorderRadius, configFile.theme.spacing, configFile.theme.extend.spacing), 'borderRadius', true);
-
-	configFile.theme.borderWidth = combineKeys(configFile.theme, defaultTheme.borderWidth, 'borderWidth', false);
-
-	configFile.theme.displayUtilities = {};
-
-	configFile.theme.margin = combineKeys(configFile.theme, base.spacing, 'margin', true);
-
-	configFile.theme.padding = combineKeys(configFile.theme, base.spacing, 'padding', true);
-
-	configFile.theme.width = base.width;
+	configFile.theme.extendEdges = {};
+	configFile.theme.extendSafeArea = {};
+	configFile.theme.flagSecure = {};
+	configFile.theme.flip = {};
+	configFile.theme.fontFamily = combineKeys(configFile.theme, {}, 'fontFamily');
+	configFile.theme.fontSize = combineKeys(configFile.theme, defaultTheme.fontSize, 'fontSize');
+	configFile.theme.fontStyle = {};
+	configFile.theme.fontWeight = combineKeys(configFile.theme, defaultTheme.fontWeight, 'fontWeight');
+	configFile.theme.fullscreen = {};
+	configFile.theme.gap = combineKeys(configFile.theme, base.spacing, 'margin');
+	configFile.theme.gradientColorStops = combineKeys(configFile.theme, base.colors, 'gradientColorStops');
+	configFile.theme.gridColumnsStartEnd = {};
+	configFile.theme.gridFlow = {};
+	configFile.theme.gridSystem = {};
 	configFile.theme.height = base.height;
-
-	configFile.theme.shadow = {};
-	configFile.theme.shadowColor = combineKeys(configFile.theme, base.colors, 'shadowColor', true);
-
-	configFile.theme.opacity = (configFile.theme.opacity) ? _.merge(configFile.theme.opacity, configFile.theme.extend.opacity) : _.merge(defaultTheme.opacity, configFile.theme.extend.opacity);
-
+	configFile.theme.hidesBackButton = {};
+	configFile.theme.hidesBarsOnSwipe = {};
+	configFile.theme.hidesBarsOnTap = {};
+	configFile.theme.hidesBarsWhenKeyboardAppears = {};
+	configFile.theme.hideShadow = {};
+	configFile.theme.hidesSearchBarWhenScrolling = {};
+	configFile.theme.homeIndicatorAutoHidden = {};
+	configFile.theme.iconIsMask = {};
+	configFile.theme.includeOpaqueBars = {};
+	configFile.theme.indicatorColor = combineKeys(configFile.theme, base.colors, 'indicatorColor');
 	configFile.theme.interactivity = {};
-
 	configFile.theme.items = {};
+	configFile.theme.keepScreenOn = {};
+	configFile.theme.keepSectionsInSearch = {};
+	configFile.theme.keyboardAppearance = {};
+	configFile.theme.keyboardDismissMode = {};
+	configFile.theme.keyboardType = {};
+	configFile.theme.largeTitleDisplayMode = {};
+	configFile.theme.largeTitleEnabled = {};
 	configFile.theme.layout = {};
-	configFile.theme.clipMode = {};
-	configFile.theme.draggingConstraints = {};
-	configFile.theme.draggingType = {};
-	configFile.theme.scrollType = {};
-	configFile.theme.transition = {};
-	configFile.theme.exitOnClose = {};
-	configFile.theme.preventDefaultImage = {};
-	configFile.theme.tiMedia = {};
-	configFile.theme.autoreverse = {};
-	configFile.theme.repeat = { ...configFile.theme.repeat, ...configFile.theme.extend.repeat };
-	configFile.theme.origin = { ...configFile.theme.origin, ...configFile.theme.extend.origin };
-	configFile.theme.scale = { ...defaultTheme.scale, ...configFile.theme.scale, ...configFile.theme.extend.scale };
-	configFile.theme.rotate = { ...defaultTheme.rotate, ...configFile.theme.rotate, ...configFile.theme.extend.rotate };
-	configFile.theme.transitionDelay = { ...defaultTheme.transitionDelay, ...configFile.theme.transitionDelay, ...configFile.theme.extend.transitionDelay };
-	configFile.theme.transitionDuration = { ...defaultTheme.transitionDuration, ...configFile.theme.transitionDuration, ...configFile.theme.extend.transitionDuration };
-
-	configFile.theme.bounce = {};
+	configFile.theme.lazyLoadingEnabled = {};
+	configFile.theme.loginKeyboardType = {};
+	configFile.theme.loginReturnKeyType = {};
+	configFile.theme.margin = combineKeys(configFile.theme, base.spacing, 'margin');
+	configFile.theme.modal = {};
+	configFile.theme.navBarHidden = {};
+	configFile.theme.navTintColor = combineKeys(configFile.theme, base.colors, 'navTintColor');
+	configFile.theme.opacity = combineKeys(configFile.theme, defaultTheme.opacity, 'opacity');
+	configFile.theme.orientationModes = {};
+	configFile.theme.origin = {};
 	configFile.theme.overlay = {};
-	configFile.theme.displayCaps = {};
-	configFile.theme.flip = {};
-	configFile.theme.scrolling = {};
+	configFile.theme.padding = combineKeys(configFile.theme, base.spacing, 'padding');
+	configFile.theme.pageIndicatorColor = combineKeys(configFile.theme, base.colors, 'pageIndicatorColor');
 	configFile.theme.pagingControl = {};
+	configFile.theme.pagingControlAlpha = combineKeys(configFile.theme, defaultTheme.opacity, 'opacity');
+	configFile.theme.pagingControlColor = combineKeys(configFile.theme, base.colors, 'pagingControlColor');
+	configFile.theme.pagingControlHeight = base.height;
 	configFile.theme.pagingControlOnTop = {};
-	configFile.theme.keepScreenOn = {};
-	configFile.theme.zIndex = { ...defaultTheme.zIndex, ...configFile.theme.zIndex, ...configFile.theme.extend.zIndex };
+	configFile.theme.pagingControlTimeout = combineKeys(configFile.theme, { ...{ '0': '0ms', '25': '25ms', '50': '50ms', '2000': '2000ms', '3000': '3000ms', '4000': '4000ms', '5000': '5000ms' }, ...defaultTheme.transitionDelay }, 'pagingControlTimeout');
+	configFile.theme.passwordKeyboardType = {};
+	configFile.theme.pickerType = {};
+	configFile.theme.placeholderColor = combineKeys(configFile.theme, base.colors, 'placeholderColor');
+	configFile.theme.placement = {};
+	configFile.theme.preventDefaultImage = {};
+	configFile.theme.repeat = {};
+	configFile.theme.returnKeyType = {};
+	configFile.theme.rotate = combineKeys(configFile.theme, defaultTheme.rotate, 'rotate');
+	configFile.theme.scale = combineKeys(configFile.theme, { ...{ 5: '.05', 10: '.10', 25: '.25' }, ...defaultTheme.scale }, 'scale');
+	configFile.theme.scrollableRegion = {};
+	configFile.theme.scrollIndicators = {};
+	configFile.theme.scrollingEnabled = {};
+	configFile.theme.scrollType = {};
+	configFile.theme.shadow = {};
+	configFile.theme.shadowColor = combineKeys(configFile.theme, base.colors, 'shadowColor');
+	configFile.theme.shiftMode = {};
+	configFile.theme.showAsAction = {};
+	configFile.theme.showCancel = {};
+	configFile.theme.smoothScrollOnTabClick = {};
+	configFile.theme.statusBar = {};
+	configFile.theme.sustainedPerformanceMode = {};
+	configFile.theme.swipeToClose = {};
+	configFile.theme.tabBarHidden = {};
+	configFile.theme.tabGroupStyle = {};
+	configFile.theme.tabsBackgroundColor = combineKeys(configFile.theme, base.colors, 'tabsBackgroundColor');
+	configFile.theme.tabsBackgroundSelectedColor = combineKeys(configFile.theme, base.colors, 'tabsBackgroundSelectedColor');
+	configFile.theme.tabsTranslucent = {};
+	configFile.theme.textAlign = {};
+	configFile.theme.textColor = combineKeys(configFile.theme, base.colors, 'textColor');
+	configFile.theme.tiMedia = {};
+	configFile.theme.tintColor = combineKeys(configFile.theme, base.colors, 'tintColor');
+	configFile.theme.titleColor = combineKeys(configFile.theme, base.colors, 'titleColor');
+	configFile.theme.touchFeedbackColor = combineKeys(configFile.theme, base.colors, 'touchFeedbackColor');
+	configFile.theme.transition = {};
+	configFile.theme.transitionDelay = combineKeys(configFile.theme, { ...{ '0': '0ms', '25': '25ms', '50': '50ms', '2000': '2000ms', '3000': '3000ms', '4000': '4000ms', '5000': '5000ms' }, ...defaultTheme.transitionDelay }, 'transitionDelay');
+	configFile.theme.transitionDuration = combineKeys(configFile.theme, { ...{ 0: '0ms', 25: '25ms', 50: '50ms' }, ...defaultTheme.transitionDuration }, 'transitionDuration');
+	configFile.theme.translucent = {};
+	configFile.theme.useSpinner = {};
+	configFile.theme.verticalAlignment = {};
+	configFile.theme.width = base.width;
+	configFile.theme.windowPixelFormat = {};
+	configFile.theme.windowSoftInputMode = {};
+	configFile.theme.zIndex = combineKeys(configFile.theme, defaultTheme.zIndex, 'zIndex');
 
+	// !Some final cleanup
 	delete configFile.theme.extend;
 	delete configFile.theme.colors;
 	delete configFile.theme.spacing;
 	delete configFile.theme.borderRadius;
 
-	_.each(configFile.corePlugins, (value, key) => {
-		delete configFile.theme[key];
+	if (!Object.keys(configFile.theme.fontFamily).length) {
+		delete configFile.theme.fontFamily;
+	}
+
+	// !Delete corePlugins specified in the config file
+	let corePlugins = Array.isArray(configFile.corePlugins) ? configFile.corePlugins : Object.keys(configFile.corePlugins).map(key => key);
+	// convert Object to Array
+	_.each(corePlugins, value => {
+		delete configFile.theme[value];
 	});
 
 	let sorted = Object.entries(configFile.theme).sort().reduce((object, [key, value]) => (object[key] = value, object), {});
@@ -908,124 +967,173 @@ function buildCustomTailwind(message = 'file created!') {
 
 	tailwindStyles += `// config.js file updated on: ${getFileUpdatedDate(destConfigJSFile)}\n` + '\n// Custom Styles and Resets\n';
 
-	// console.log(JSON.stringify(sorted));
-
 	_.each(sorted, (value, key) => {
-		tailwindStyles += buildCustomTailwindClasses(key, value);
+		tailwindStyles += helpersToBuildCustomTailwindClasses(key, value);
 	});
 
-	// console.log(JSON.stringify(tailwindStyles));
-
 	fs.writeFileSync(customTailwindFile, helpers.applyProperties(tailwindStyles));
 
 	logger.info(chalk.yellow('./purgetss/tailwind.tss'), message);
 }
 
 //! Build tailwind's custom values
-function buildCustomTailwindClasses(key, value) {
+function helpersToBuildCustomTailwindClasses(key, value) {
 	switch (key) {
-		case 'autoreverse': return helpers.autoreverse();
-		case 'backgroundColor': return helpers.backgroundColor(value);
-		case 'barColor': return helpers.barColor(value);
-		case 'titleColor': return helpers.titleColor(value);
+
+		case 'activeIconIsMask': return helpers.activeIconIsMask();
 		case 'activeTintColor': return helpers.activeTintColor(value);
 		case 'activeTitleColor': return helpers.activeTitleColor(value);
-		case 'tabsBackgroundColor': return helpers.tabsBackgroundColor(value);
-		case 'navTintColor': return helpers.navTintColor(value);
-		case 'tabsBackgroundSelectedColor': return helpers.tabsBackgroundSelectedColor(value);
-		case 'linearGradient': return helpers.linearGradient();
-		case 'radialGradient': return helpers.radialGradient();
-		case 'keepScreenOn': return helpers.keepScreenOn();
+		case 'activityEnterTransition': return helpers.activityEnterTransition();
+		case 'activityExitTransition': return helpers.activityExitTransition();
+		case 'activityIndicatorStyle': return helpers.activityIndicatorStyle();
+		case 'activityReenterTransition': return helpers.activityReenterTransition();
+		case 'activityReturnTransition': return helpers.activityReturnTransition();
+		case 'activitySharedElementEnterTransition': return helpers.activitySharedElementEnterTransition();
+		case 'activitySharedElementExitTransition': return helpers.activitySharedElementExitTransition();
+		case 'activitySharedElementReenterTransition': return helpers.activitySharedElementReenterTransition();
+		case 'activitySharedElementReturnTransition': return helpers.activitySharedElementReturnTransition();
+		case 'allowUserCustomization': return helpers.allowUserCustomization();
+		case 'autoAdjustScrollViewInsets': return helpers.autoAdjustScrollViewInsets();
+		case 'autocapitalization': return helpers.autocapitalization();
+		case 'autocorrect': return helpers.autocorrect();
+		case 'autofillType': return helpers.autofillType();
+		case 'autoLink': return helpers.autoLink();
+		case 'autoreverse': return helpers.autoreverse();
+		case 'backgroundBlendMode': return helpers.backgroundBlendMode();
+		case 'backgroundColor': return helpers.backgroundColor(value);
+		case 'backgroundLinearGradient': return helpers.linearGradient();
+		case 'backgroundRadialGradient': return helpers.radialGradient();
 		case 'backgroundSelectedColor': return helpers.backgroundSelectedColor(value);
+		case 'barColor': return helpers.barColor(value);
+		case 'barTitleColor': return helpers.barTitleColor(value);
+		case 'barTitleShadow': return helpers.barTitleShadow();
+		case 'barTitleShadowColor': return helpers.barTitleShadowColor(value);
 		case 'borderColor': return helpers.borderColor(value);
 		case 'borderRadiusExtraStyles': return helpers.borderRadiusExtraStyles(value);
+		case 'borderStyle': return helpers.borderStyle();
 		case 'borderWidth': return helpers.borderWidth(value);
+		case 'bottomNavigation': return helpers.bottomNavigation(value);
+		case 'bubbleParent': return helpers.bubbleParent();
+		case 'cacheSize': return helpers.cacheSize();
 		case 'clipMode': return helpers.clipMode();
-		case 'contentWidth': return helpers.contentWidth();
-		case 'preventDefaultImage': return helpers.preventDefaultImage();
-		case 'tiMedia': return helpers.tiMedia();
+		case 'currentPageIndicatorColor': return helpers.currentPageIndicatorColor(value);
+		case 'disableBounce': return helpers.disableBounce();
+		case 'displayCaps': return helpers.displayCaps();
+		case 'displayUtilities': return helpers.displayUtilities();
 		case 'draggingConstraints': return helpers.draggingConstraints();
 		case 'draggingType': return helpers.draggingType();
-		case 'displayUtilities': return helpers.displayUtilities();
+		case 'dropShadow': return helpers.dropShadow();
+		case 'dropShadowColor': return helpers.dropShadowColor(value);
+		case 'editable': return helpers.editable();
+		case 'ellipsize': return helpers.ellipsize();
+		case 'enableCopy': return helpers.enableCopy();
+		case 'enableReturnKey': return helpers.enableReturnKey();
 		case 'exitOnClose': return helpers.exitOnClose();
+		case 'extendBackground': return helpers.extendBackground();
+		case 'extendEdges': return helpers.extendEdges();
+		case 'extendSafeArea': return helpers.extendSafeArea();
+		case 'flagSecure': return helpers.flagSecure();
+		case 'flip': return helpers.flip();
 		case 'fontFamily': return helpers.fontFamily(value);
 		case 'fontSize': return helpers.fontSize(value);
 		case 'fontStyle': return helpers.fontStyle();
 		case 'fontWeight': return helpers.fontWeight(value);
-		case 'gaps': return helpers.gaps(value);
+		case 'fullscreen': return helpers.fullscreen();
+		case 'gap': return helpers.gap(value);
 		case 'gradientColorStops': return helpers.gradientColorStops(value);
 		case 'gridColumnsStartEnd': return helpers.gridColumnsStartEnd();
 		case 'gridFlow': return helpers.gridFlow();
 		case 'gridSystem': return helpers.gridSystem();
 		case 'height': return helpers.height(value);
-		case 'zIndex': return helpers.zIndex(value);
-
-		case 'bounce': return helpers.bounce();
-		case 'overlay': return helpers.overlay();
-		case 'displayCaps': return helpers.displayCaps();
-		case 'scrolling': return helpers.scrolling();
-		case 'pagingControl': return helpers.pagingControl();
-		case 'pagingControlOnTop': return helpers.pagingControlOnTop();
-
-		case 'pagingControlAlpha': return helpers.pagingControlAlpha(value);
-		case 'pagingControlTimeout': return helpers.pagingControlTimeout(value);
-		case 'pagingControlColor': return helpers.pagingControlColor(value);
-		case 'pageIndicatorColor': return helpers.pageIndicatorColor(value);
-		case 'currentPageIndicatorColor': return helpers.currentPageIndicatorColor(value);
-		case 'pagingControlHeight': return helpers.pagingControlHeight(value);
-
+		case 'hidesBackButton': return helpers.hidesBackButton();
+		case 'hidesBarsOnSwipe': return helpers.hidesBarsOnSwipe();
+		case 'hidesBarsOnTap': return helpers.hidesBarsOnTap();
+		case 'hidesBarsWhenKeyboardAppears': return helpers.hidesBarsWhenKeyboardAppears();
+		case 'hideShadow': return helpers.hideShadow();
+		case 'hidesSearchBarWhenScrolling': return helpers.hidesSearchBarWhenScrolling();
+		case 'homeIndicatorAutoHidden': return helpers.homeIndicatorAutoHidden();
+		case 'iconIsMask': return helpers.iconIsMask();
+		case 'includeOpaqueBars': return helpers.includeOpaqueBars();
+		case 'indicatorColor': return helpers.indicatorColor(value);
 		case 'interactivity': return helpers.interactivity(value);
 		case 'items': return helpers.items();
+		case 'keepScreenOn': return helpers.keepScreenOn();
+		case 'keepSectionsInSearch': return helpers.keepSectionsInSearch();
+		case 'keyboardAppearance': return helpers.keyboardAppearance();
+		case 'keyboardDismissMode': return helpers.keyboardDismissMode();
+		case 'keyboardType': return helpers.keyboardType();
+		case 'largeTitleDisplayMode': return helpers.largeTitleDisplayMode();
+		case 'largeTitleEnabled': return helpers.largeTitleEnabled();
 		case 'layout': return helpers.layout();
-		case 'flip': return helpers.flip();
+		case 'lazyLoadingEnabled': return helpers.lazyLoadingEnabled();
+		case 'loginKeyboardType': return helpers.loginKeyboardType();
+		case 'loginReturnKeyType': return helpers.loginReturnKeyType();
 		case 'margin': return helpers.margin(value);
-
+		case 'modal': return helpers.modal();
+		case 'navBarHidden': return helpers.navBarHidden();
+		case 'navTintColor': return helpers.navTintColor(value);
 		case 'opacity': return helpers.opacity(value);
+		case 'orientationModes': return helpers.orientationModes();
+		case 'origin': return helpers.origin();
+		case 'overlay': return helpers.overlay();
 		case 'padding': return helpers.padding(value);
+		case 'pageIndicatorColor': return helpers.pageIndicatorColor(value);
+		case 'pagingControl': return helpers.pagingControl();
+		case 'pagingControlAlpha': return helpers.pagingControlAlpha(value);
+		case 'pagingControlColor': return helpers.pagingControlColor(value);
+		case 'pagingControlHeight': return helpers.pagingControlHeight(value);
+		case 'pagingControlOnTop': return helpers.pagingControlOnTop();
+		case 'pagingControlTimeout': return helpers.pagingControlTimeout(value);
+		case 'passwordKeyboardType': return helpers.passwordKeyboardType();
+		case 'pickerType': return helpers.pickerType();
 		case 'placeholderColor': return helpers.placeholderColor(value);
 		case 'placement': return helpers.placement();
-		case 'repeat': return helpers.repeat(value);
+		case 'preventDefaultImage': return helpers.preventDefaultImage();
+		case 'repeat': return helpers.repeat();
+		case 'returnKeyType': return helpers.returnKeyType();
 		case 'rotate': return helpers.rotate(value);
-		case 'origin': return helpers.origin(value);
 		case 'scale': return helpers.scale(value);
 		case 'scrollableRegion': return helpers.scrollableRegion();
 		case 'scrollIndicators': return helpers.scrollIndicators();
+		case 'scrollingEnabled': return helpers.scrollingEnabled();
 		case 'scrollType': return helpers.scrollType();
 		case 'shadow': return helpers.shadow();
 		case 'shadowColor': return helpers.shadowColor(value);
-		case 'transition': return helpers.transition(value);
-		case 'transitionDelay': return helpers.transitionDelay(value);
-		case 'transitionDuration': return helpers.transitionDuration(value);
-		case 'textAlign': return helpers.textAlign();
-		case 'autocapitalization': return helpers.autocapitalization();
-		case 'autoLink': return helpers.autoLink();
-		case 'borderStyle': return helpers.borderStyle();
-		case 'cacheSize': return helpers.cacheSize();
-		case 'editable': return helpers.editable();
-		case 'ellipsize': return helpers.ellipsize();
-		case 'enableCopy': return helpers.enableCopy();
-		case 'enableReturnKey': return helpers.enableReturnKey();
-		case 'extendBackground': return helpers.extendBackground();
-		case 'keyboardAppearance': return helpers.keyboardAppearance();
-		case 'keyboardType': return helpers.keyboardType();
-		case 'returnKeyType': return helpers.returnKeyType();
-		case 'autocorrect': return helpers.autocorrect();
-		case 'autofillType': return helpers.autofillType();
+		case 'shiftMode': return helpers.shiftMode();
+		case 'showAsAction': return helpers.showAsAction();
 		case 'showCancel': return helpers.showCancel();
+		case 'smoothScrollOnTabClick': return helpers.smoothScrollOnTabClick();
+		case 'statusBar': return helpers.statusBar();
+		case 'sustainedPerformanceMode': return helpers.sustainedPerformanceMode();
+		case 'swipeToClose': return helpers.swipeToClose();
+		case 'tabBarHidden': return helpers.tabBarHidden();
+		case 'tabGroupStyle': return helpers.tabGroupStyle();
+		case 'tabsBackgroundColor': return helpers.tabsBackgroundColor(value);
+		case 'tabsBackgroundSelectedColor': return helpers.tabsBackgroundSelectedColor(value);
+		case 'tabsTranslucent': return helpers.tabsTranslucent();
+		case 'textAlign': return helpers.textAlign();
 		case 'textColor': return helpers.textColor(value);
+		case 'tiMedia': return helpers.tiMedia();
 		case 'tintColor': return helpers.tintColor(value);
+		case 'titleColor': return helpers.titleColor(value);
 		case 'touchFeedbackColor': return helpers.touchFeedbackColor(value);
+		case 'transition': return helpers.transition(value);
+		case 'transitionDelay': return helpers.transitionDelay(value);
+		case 'transitionDuration': return helpers.transitionDuration(value);
+		case 'translucent': return helpers.translucent();
+		case 'useSpinner': return helpers.useSpinner(value);
 		case 'verticalAlignment': return helpers.verticalAlignment();
 		case 'width': return helpers.width(value);
+		case 'windowPixelFormat': return helpers.windowPixelFormat();
+		case 'windowSoftInputMode': return helpers.windowSoftInputMode();
+		case 'zIndex': return helpers.zIndex(value);
 
 		default: return helpers.customRules(value, key);
 	}
 }
 
-function combineKeys(values, base, key, extras = false) {
-	let _extras = (extras) ? base : {};
-
-	return (values[key]) ? { ..._extras, ...values[key], ...values.extend[key] } : { ...base, ...values.extend[key] };
+function combineKeys(values, base, key) {
+	return (values[key]) ? { ...values[key], ...values.extend[key] } : { ...base, ...values.extend[key] };
 }
 
 function extractClasses(currentText, currentFile) {
@@ -1111,6 +1219,11 @@ function copyFont(vendor) {
 		case 'tablericons':
 			copyTablerIconsFonts();
 			break;
+		case 'bi':
+		case 'bootstrap':
+		case 'bootstrapicons':
+			copyBootstrapIconsFonts();
+			break;
 	}
 }
 
@@ -1154,9 +1267,15 @@ function copyFontLibrary(vendor) {
 		case 'ti':
 		case 'tabler':
 		case 'tablericons':
-			fs.copyFileSync(srcLibTi, destLibFolder + '/tablericons.js');
+			fs.copyFileSync(srcLibTI, destLibFolder + '/tablericons.js');
 			logger.info('Tabler Icons CommonJS module copied to', chalk.yellow('./app/lib'), 'folder');
 			break;
+		case 'bi':
+		case 'bootstrap':
+		case 'bootstrapicons':
+			fs.copyFileSync(srcLibBI, destLibFolder + '/bootstrapicons.js');
+			logger.info('Bootstrap Icons CommonJS module copied to', chalk.yellow('./app/lib'), 'folder');
+			break;
 	}
 }
 
@@ -1213,7 +1332,7 @@ function finish(customMessage = 'Finished purging in') {
 //! Purge Functions
 //! Tailwind
 function purgeTailwind(uniqueClasses) {
-	let purgedClasses = '\n// Tailwind styles\n';
+	let purgedClasses = '\n// Main styles\n';
 	let tailwindFile = (fs.existsSync(customTailwindFile)) ? customTailwindFile : defaultTailwindFile;
 	let tailwindClasses = fs.readFileSync(tailwindFile, 'utf8').split(/\r?\n/);
 
@@ -1248,56 +1367,70 @@ function purgeTailwind(uniqueClasses) {
 		}
 	});
 
+	let comoArreglo = [];
 	tailwindClasses.forEach(tailwindClass => {
 		if (tailwindClass !== '' && !tailwindClass.includes('//')) {
 			let cleanTailwindClass = `${tailwindClass.split(':')[0].replace('.', '').replace(/'/g, '').replace(/ *\[[^\]]*]/, '')}`;
 
 			if (cleanUniqueClasses.indexOf(cleanTailwindClass) > -1) {
-				purgedClasses += helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(cleanTailwindClass)]);
+				// purgedClasses += helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(cleanTailwindClass)]);
+				comoArreglo.push(helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(cleanTailwindClass)]));
 			}
 
 			if (cleanUniqueClasses.indexOf(`ios:${cleanTailwindClass}`) > -1) {
-				purgedClasses += helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(`ios:${cleanTailwindClass}`)]);
+				// purgedClasses += helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(`ios:${cleanTailwindClass}`)]);
+				comoArreglo.push(helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(`ios:${cleanTailwindClass}`)]));
 			}
 
 			if (cleanUniqueClasses.indexOf(`android:${cleanTailwindClass}`) > -1) {
-				purgedClasses += helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(`android:${cleanTailwindClass}`)]);
+				// purgedClasses += helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(`android:${cleanTailwindClass}`)]);
+				comoArreglo.push(helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(`android:${cleanTailwindClass}`)]));
 			}
 
 			if (cleanUniqueClasses.indexOf(`tablet:${cleanTailwindClass}`) > -1) {
-				purgedClasses += helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(`tablet:${cleanTailwindClass}`)]);
+				// purgedClasses += helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(`tablet:${cleanTailwindClass}`)]);
+				comoArreglo.push(helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(`tablet:${cleanTailwindClass}`)]));
 			}
 
 			if (cleanUniqueClasses.indexOf(`handheld:${cleanTailwindClass}`) > -1) {
-				purgedClasses += helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(`handheld:${cleanTailwindClass}`)]);
+				// purgedClasses += helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(`handheld:${cleanTailwindClass}`)]);
+				comoArreglo.push(helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(`handheld:${cleanTailwindClass}`)]));
 			}
 
 			if (cleanUniqueClasses.indexOf(`open:${cleanTailwindClass}`) > -1) {
-				purgedClasses += helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(`open:${cleanTailwindClass}`)]);
+				// purgedClasses += helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(`open:${cleanTailwindClass}`)]);
+				comoArreglo.push(helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(`open:${cleanTailwindClass}`)]));
 			}
 
 			if (cleanUniqueClasses.indexOf(`close:${cleanTailwindClass}`) > -1) {
-				purgedClasses += helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(`close:${cleanTailwindClass}`)]);
+				// purgedClasses += helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(`close:${cleanTailwindClass}`)]);
+				comoArreglo.push(helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(`close:${cleanTailwindClass}`)]));
 			}
 
 			if (cleanUniqueClasses.indexOf(`drag:${cleanTailwindClass}`) > -1) {
-				purgedClasses += helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(`drag:${cleanTailwindClass}`)]);
+				// purgedClasses += helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(`drag:${cleanTailwindClass}`)]);
+				comoArreglo.push(helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(`drag:${cleanTailwindClass}`)]));
 			}
 
 			if (cleanUniqueClasses.indexOf(`drop:${cleanTailwindClass}`) > -1) {
-				purgedClasses += helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(`drop:${cleanTailwindClass}`)]);
+				// purgedClasses += helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(`drop:${cleanTailwindClass}`)]);
+				comoArreglo.push(helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(`drop:${cleanTailwindClass}`)]));
 			}
 
 			if (cleanUniqueClasses.indexOf(`complete:${cleanTailwindClass}`) > -1) {
-				purgedClasses += helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(`complete:${cleanTailwindClass}`)]);
+				// purgedClasses += helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(`complete:${cleanTailwindClass}`)]);
+				comoArreglo.push(helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(`complete:${cleanTailwindClass}`)]));
 			}
 
 			if (cleanUniqueClasses.indexOf(`bounds:${cleanTailwindClass}`) > -1) {
-				purgedClasses += helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(`bounds:${cleanTailwindClass}`)]);
+				// purgedClasses += helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(`bounds:${cleanTailwindClass}`)]);
+				comoArreglo.push(helpers.checkPlatformAndDevice(tailwindClass, cleanUniqueClasses[cleanUniqueClasses.indexOf(`bounds:${cleanTailwindClass}`)]));
 			}
 		}
 	});
 
+	purgedClasses += comoArreglo.join('');
+
 	// Styles with color opacity modifiers
 	if (classesWithOpacityValues.length > 0) {
 		purgedClasses += '\n// Styles with color opacity modifiers\n';
@@ -1332,9 +1465,10 @@ function cleanClassNameFn(className) {
 }
 
 const arbitraryValuesTable = {
-	// Check if they are really needed
 	'active-tint': '{ activeTintColor: {value} }',
 	'active-title': '{ activeTitleColor: {value} }',
+	'bar-title': '{ titleAttributes : { color : {value} } }',
+	'bar-title-shadow': '{ titleAttributes: { shadow: { color: {value} } } }',
 	'bar': '{ barColor: {value} }',
 	'bg-selected': '{ backgroundSelectedColor: {value} }',
 	'bg': '{ backgroundColor: {value} }',
@@ -1347,6 +1481,7 @@ const arbitraryValuesTable = {
 	'content': '{ contentWidth: {value}, contentHeight: {value} }',
 	'current-page': '{ currentPageIndicatorColor: {value} }',
 	'delay': '{ delay: {value} }',
+	'drop-shadow': '{ shadowColor: {value} } }',
 	'duration': '{ duration: {value} }',
 	'feedback': '{ touchFeedback: true, touchFeedbackColor: {value} }',
 	'font': '{ fontWeight: {value} }',
@@ -1354,6 +1489,7 @@ const arbitraryValuesTable = {
 	'grid-cols': '{ width: Alloy.Globals.cols_{value} }',
 	'grid-rows': '{ height: Alloy.Globals.rows_{value} }',
 	'h': '{ height: {value}}',
+	'indicator': '{ indicatorColor: {value} }',
 	'left': '{ left: {value} }',
 	'm': '{ top: {value}, right: {value}, bottom: {value}, left: {value} }',
 	'max-scale': '{ maxZoomScale: {value} }',
@@ -1368,6 +1504,9 @@ const arbitraryValuesTable = {
 	'opacity': '{ opacity: {value} }',
 	'origin': '{ anchorPoint: { x: {value}, y: {value1} } }',
 	'p': '{ padding: { top: {value}, right: {value}, bottom: {value}, left: {value} } }',
+	'padding-bottom': '{ paddingBottom: {value} }',
+	'padding-left': '{ paddingLeft: {value} }',
+	'padding-right': '{ paddingRight: {value} }',
 	'page': '{ pageIndicatorColor: {value} }',
 	'paging-alpha': '{ pagingControlAlpha: {value} }',
 	'paging-color': '{ pagingControlColor: {value} }',
@@ -1386,11 +1525,11 @@ const arbitraryValuesTable = {
 	'tabs-bg': '{ tabsBackgroundColor: {value} }',
 	'text-color': '{ color: {value} }',
 	'text-size': '{ font: { fontSize: {value} } }',
-	'tint': '{ tintColor: {value} }',
+	'tint': '{ tint: {value}, tintColor: {value} }',
 	'title': '{ titleColor: {value} }',
 	'to': '{ backgroundGradient: { colors: [ {value} ] } }',
 	'top': '{ top: {value} }',
-	'w': '{ width: {value} }'
+	'w': '{ width: {value} }',
 };
 
 function formatArbitraryValues(arbitraryValue) {
@@ -1436,6 +1575,7 @@ function formatArbitraryValues(arbitraryValue) {
 			return `'.${arbitraryValue}': ` + _.replace(properties, new RegExp("{value}", "g"), helpers.parseValue(value, sign));
 		}
 	} else if (splitedContent.length === 3) {
+
 		let rule = `${splitedContent[0]}-${splitedContent[1]}`;
 
 		let value = splitedContent[2].match(/(?<=\().*(?=\))/).pop();
@@ -1538,6 +1678,17 @@ function purgeTablerIcons(uniqueClasses, cleanUniqueClasses) {
 	return (purgedClasses === '\n// Tabler Icons styles\n') ? '' : purgedClasses;
 }
 
+//! BootstrapIcons
+function purgeBootstrapIcons(uniqueClasses, cleanUniqueClasses) {
+	let purgedClasses = '\n// Bootstrap Icons styles\n';
+
+	let sourceTSS = fs.readFileSync(srcBootstrapIconsFontTSSFile, 'utf8').split(/\r?\n/);
+
+	purgedClasses += processFontIcons(sourceTSS, uniqueClasses, 'Purging Bootstrap Icons styles...', cleanUniqueClasses, ['bi', 'bootstrap']);
+
+	return (purgedClasses === '\n// Bootstrap Icons styles\n') ? '' : purgedClasses;
+}
+
 function processFontIcons(sourceTSS, uniqueClasses, message, cleanUniqueClasses, fontFamily) {
 	let purgedClasses = '';
 	let soc = sourceTSS.toString();