diff --git a/src/components/Person.js b/src/components/Person.js
index a426b924..00dfe9c0 100644
--- a/src/components/Person.js
+++ b/src/components/Person.js
@@ -144,7 +144,7 @@ Person.propTypes = {
     description: PropTypes.string,
     tags: PropTypes.arrayOf(PropTypes.string),
     country: PropTypes.string,
-    computer: PropTypes.oneOf(['apple', 'windows', 'linux']),
+    computer: PropTypes.oneOf(['apple', 'windows', 'linux', 'bsd']),
     phone: PropTypes.oneOf(['iphone', 'android', 'windowsphone', 'flipphone']),
     twitter(props, propName, componentName) {
       if (!/^@?(\w){1,15}$/.test(props[propName])) {
diff --git a/src/data.js b/src/data.js
index 82f4eda8..6c88f4cc 100644
--- a/src/data.js
+++ b/src/data.js
@@ -223,7 +223,7 @@ module.exports = [
     description: 'Crafting the future, Today.',
     url: 'https://yesbhautik.co.in/uses',
     emoji: '🍀',
-    country: 'in',
+    country: '🇮🇳',
     twitter: '@yesbhautik',
     computer: 'apple',
     phone: 'android',
@@ -5532,8 +5532,8 @@ module.exports = [
     url: 'https://www.michaelkitzman.com/uses',
     emoji: '🤔',
     country: '🇺🇸',
-    computer: 'mac',
-    phone: 'ios',
+    computer: 'apple',
+    phone: 'iphone',
     tags: [
       'Frontend',
       'Web Developer',
@@ -11331,7 +11331,7 @@ module.exports = [
       'An aspiring financial data analyst, seeking new projects and opportunities',
     url: 'https://the-quach.com/uses/',
     emoji: '🔮',
-    country: 'ca',
+    country: '🇨🇦',
     computer: 'apple',
     phone: 'iphone',
     tags: [
@@ -18553,7 +18553,7 @@ module.exports = [
       'Full-Stack Developer from Germany with a focus on frontend and build processes/tooling.',
     url: 'https://pixelde.su/uses',
     emoji: '🎁',
-    country: 'de',
+    country: '🇩🇪',
     computer: 'windows',
     phone: 'iphone',
     tags: [
@@ -19185,8 +19185,8 @@ module.exports = [
     twitter: '@albertogalca',
     emoji: '🤘🏼',
     country: '🇪🇸',
-    computer: 'mac',
-    phone: 'ios',
+    computer: 'apple',
+    phone: 'iphone',
     tags: [
       'Bear',
       'React',
diff --git a/src/images/bsd.png b/src/images/bsd.png
new file mode 100644
index 00000000..d7d9b974
Binary files /dev/null and b/src/images/bsd.png differ
diff --git a/src/util/icons.js b/src/util/icons.js
index c3b5d2b8..b19f3a1d 100644
--- a/src/util/icons.js
+++ b/src/util/icons.js
@@ -5,5 +5,6 @@ import windows from '../images/windows.svg';
 import apple from '../images/apple.svg';
 import linux from '../images/linux.png';
 import flipphone from '../images/flip-phone.png';
+import bsd from '../images/bsd.png';
 
-export { iphone, android, windowsphone, windows, apple, linux, flipphone };
+export { iphone, android, windowsphone, windows, apple, linux, flipphone, bsd };