diff --git a/.travis.yml b/.travis.yml
index f2566128..381e0cab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ before_install:
     - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install screenresolution; fi
 
 script:
-    - time ./neofetch --ascii --config config/travis -v
+    - time ./neofetch --ascii --config config/travis.conf -v
     # See this wiki page for why we're disabling these errors.
     # https://github.com/dylanaraps/neofetch/wiki/Shellcheck-Exclusions
     - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck neofetch -e SC1090,SC2009,SC2012,SC2016,SC2034,SC2128,SC2153,SC2154,SC2178,SC2010; fi
diff --git a/config/config b/config/config.conf
similarity index 99%
rename from config/config
rename to config/config.conf
index 78117864..1575de10 100644
--- a/config/config
+++ b/config/config.conf
@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-#
 # Neofetch config file
 # https://github.com/dylanaraps/neofetch
 
diff --git a/config/travis b/config/travis.conf
similarity index 97%
rename from config/travis
rename to config/travis.conf
index 903818f9..ad3bac08 100644
--- a/config/travis
+++ b/config/travis.conf
@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-#
 # Neofetch config file for travis.ci
 # https://github.com/dylanaraps/neofetch
 
diff --git a/neofetch b/neofetch
index eb8b7d2f..c842a98f 100755
--- a/neofetch
+++ b/neofetch
@@ -1038,6 +1038,7 @@ get_cpu() {
     cpu="${cpu//Quad-Core}"
     cpu="${cpu//Six-Core}"
     cpu="${cpu//Eight-Core}"
+    cpu="${cpu//, * Compute Cores}"
     cpu="${cpu//Core}"
     cpu="${cpu//with Radeon * Graphics}"
     cpu="${cpu//, altivec supported}"
@@ -3601,21 +3602,21 @@ get_full_path() {
 }
 
 get_default_config() {
-    if [[ -f "/etc/neofetch/config" ]]; then
-        default_config="/etc/neofetch/config"
+    if [[ -f "/etc/neofetch/config.conf" ]]; then
+        default_config="/etc/neofetch/config.conf"
 
-    elif [[ -f "/usr/local/etc/neofetch/config" ]]; then
-        default_config="/usr/local/etc/neofetch/config"
+    elif [[ -f "/usr/local/etc/neofetch/config.conf" ]]; then
+        default_config="/usr/local/etc/neofetch/config.conf"
 
-    elif [[ -f "/data/data/com.termux/files/usr/etc/neofetch/config" ]]; then
-        default_config="/data/data/com.termux/files/usr/etc/neofetch/config"
+    elif [[ -f "/data/data/com.termux/files/usr/etc/neofetch/config.conf" ]]; then
+        default_config="/data/data/com.termux/files/usr/etc/neofetch/config.conf"
 
-    elif [[ -f "/boot/home/config/non-packaged/etc/neofetch/config" ]]; then
-        default_config="/boot/home/config/non-packaged/etc/neofetch/config"
+    elif [[ -f "/boot/home/config/non-packaged/etc/neofetch/config.conf" ]]; then
+        default_config="/boot/home/config/non-packaged/etc/neofetch/config.conf"
 
     else
         [[ -z "$script_dir" ]] && script_dir="$(get_full_path "$0")"
-        default_config="${script_dir%/*}/config/config"
+        default_config="${script_dir%/*}/config/config.conf"
     fi
 
     if source "$default_config"; then
@@ -3640,19 +3641,22 @@ get_user_config() {
     if [[ -f "${XDG_CONFIG_HOME}/neofetch/config" ]]; then
         config_file="${XDG_CONFIG_HOME}/neofetch/config"
 
-    elif [[ -f "/etc/neofetch/config" ]]; then
-        cp "/etc/neofetch/config" "${XDG_CONFIG_HOME}/neofetch"
-        config_file="${XDG_CONFIG_HOME}/neofetch/config"
+    elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config.conf" ]]; then
+        config_file="${XDG_CONFIG_HOME}/neofetch/config.conf"
 
-    elif [[ -f "/usr/local/etc/neofetch/config" ]]; then
-        cp "/usr/local/share/neofetch/config" "${XDG_CONFIG_HOME}/neofetch"
-        config_file="${XDG_CONFIG_HOME}/neofetch/config"
+    elif [[ -f "/etc/neofetch/config.conf" ]]; then
+        cp "/etc/neofetch/config.conf" "${XDG_CONFIG_HOME}/neofetch"
+        config_file="${XDG_CONFIG_HOME}/neofetch/config.conf"
+
+    elif [[ -f "/usr/local/etc/neofetch/config.conf" ]]; then
+        cp "/usr/local/share/neofetch/config.conf" "${XDG_CONFIG_HOME}/neofetch"
+        config_file="${XDG_CONFIG_HOME}/neofetch/config.conf"
 
     else
         [[ -z "$script_dir" ]] && script_dir="$(get_full_path "$0")"
 
-        cp "${script_dir%/*}/config/config" "${XDG_CONFIG_HOME}/neofetch"
-        config_file="${XDG_CONFIG_HOME}/neofetch/config"
+        cp "${script_dir%/*}/config/config.conf" "${XDG_CONFIG_HOME}/neofetch"
+        config_file="${XDG_CONFIG_HOME}/neofetch/config.conf"
     fi
 
     source "$config_file"