diff --git a/README.md b/README.md
index 1f52487..477063f 100644
--- a/README.md
+++ b/README.md
@@ -173,7 +173,7 @@ int main() {
     option::Lead{"█"},
     option::Remainder{"-"},
     option::End{"]"},
-    option::PrefixText{"Training Gaze Network "👀},
+    option::PrefixText{"Training Gaze Network "},
     option::ForegroundColor{Color::YELLOW}
     option::ShowElapsedTime{true};
     option::ShowRemainingTime{true};
@@ -364,7 +364,7 @@ int main() {
   indicators::ProgressSpinner spinner{
     option::PostfixText{"Checking credentials"},
     option::ForegroundColor{Color::YELLOW},
-    option::SpinnerStates{std::vector<std::string>{"⠈", "⠐", "⠠", "⢀", "⡀", "⠄", "⠂", "⠁"};}
+    option::SpinnerStates{std::vector<std::string>{"⠈", "⠐", "⠠", "⢀", "⡀", "⠄", "⠂", "⠁"}}
   };
  
   // Update spinner state
@@ -373,7 +373,7 @@ int main() {
       if (spinner.is_completed()) {
         spinner.set_option(option::ForegroundColor{Color::GREEN});
         spinner.set_option(option::PrefixText{"✔"});
-        spinner.set_option(option::SpinnerShow{false});
+        spinner.set_option(option::ShowSpinner{false});
         spinner.set_option(option::ShowPercentage{false});
         spinner.set_option(option::PostfixText{"Authenticated!"});
         spinner.mark_as_completed();	
diff --git a/demo/demo.cpp b/demo/demo.cpp
index 093a0d4..084d746 100644
--- a/demo/demo.cpp
+++ b/demo/demo.cpp
@@ -12,7 +12,7 @@ int main() {
     // PROGRESS BAR 1
     //
     indicators::ProgressBar p{option::BarWidth{50},
-                              option::Start{"{"},
+                              option::Start{"["},
                               option::Fill{"■"},
                               option::Lead{"■"},
                               option::Remainder{" "},
@@ -200,7 +200,7 @@ int main() {
         if (p.is_completed()) {
           p.set_option(option::ForegroundColor{indicators::Color::GREEN});
           p.set_option(option::PrefixText{"✔"});
-          p.set_option(option::SpinnerShow{false});
+          p.set_option(option::ShowSpinner{false});
           p.set_option(option::ShowPercentage{false});
           p.set_option(option::PostfixText{"Authenticated!"});
           p.mark_as_completed();
@@ -231,31 +231,31 @@ int main() {
         auto current = p.current();
         if (current == 24) {
           p.set_option(option::PrefixText{" - ✔"});
-          p.set_option(option::SpinnerShow{false});
+          p.set_option(option::ShowSpinner{false});
         } else if (current == 25) {
           std::cout << std::endl;
-          p.set_option(option::SpinnerShow{true});
+          p.set_option(option::ShowSpinner{true});
           p.set_option(option::PrefixText{" - "});
           p.set_option(option::PostfixText{"Contacting Kerbal headquarters"});
         } else if (current == 49) {
           p.set_option(option::PrefixText{" - ✔"});
-          p.set_option(option::SpinnerShow{false});
+          p.set_option(option::ShowSpinner{false});
         } else if (current == 50) {
           std::cout << std::endl;
-          p.set_option(option::SpinnerShow{true});
+          p.set_option(option::ShowSpinner{true});
           p.set_option(option::PrefixText{" - "});
           p.set_option(option::PostfixText{"Designing spaceship"});
         } else if (current == 74) {
           p.set_option(option::PrefixText{" - ✔"});
-          p.set_option(option::SpinnerShow{false});
+          p.set_option(option::ShowSpinner{false});
         } else if (current == 75) {
           std::cout << std::endl;
-          p.set_option(option::SpinnerShow{true});
+          p.set_option(option::ShowSpinner{true});
           p.set_option(option::PrefixText{" - "});
           p.set_option(option::PostfixText{"Launching rocket"});
         } else if (current == 95) {
           p.set_option(option::PrefixText{" - ✔"});
-          p.set_option(option::SpinnerShow{false});
+          p.set_option(option::ShowSpinner{false});
         } else if (current == 99) {
           std::cout << std::endl;
           //
diff --git a/include/indicators/progress_spinner.hpp b/include/indicators/progress_spinner.hpp
index ce767a3..ee98b59 100644
--- a/include/indicators/progress_spinner.hpp
+++ b/include/indicators/progress_spinner.hpp
@@ -53,7 +53,7 @@ class ProgressSpinner {
       option::ShowPercentage,
       option::ShowElapsedTime,
       option::ShowRemainingTime,
-      option::SpinnerShow,
+      option::ShowSpinner,
       option::SavedStartTime,
       option::Completed,
       option::MaxPostfixTextLen,
@@ -68,7 +68,7 @@ public:
       details::get<details::ProgressBarOption::show_percentage>(option::ShowPercentage{true}, std::forward<Args>(args)...),
       details::get<details::ProgressBarOption::show_elapsed_time>(option::ShowElapsedTime{false}, std::forward<Args>(args)...),
       details::get<details::ProgressBarOption::show_remaining_time>(option::ShowRemainingTime{false}, std::forward<Args>(args)...),
-      details::get<details::ProgressBarOption::spinner_show>(option::SpinnerShow{true}, std::forward<Args>(args)...),
+      details::get<details::ProgressBarOption::spinner_show>(option::ShowSpinner{true}, std::forward<Args>(args)...),
       details::get<details::ProgressBarOption::saved_start_time>(option::SavedStartTime{false}, std::forward<Args>(args)...),
       details::get<details::ProgressBarOption::completed>(option::Completed{false}, std::forward<Args>(args)...),
       details::get<details::ProgressBarOption::max_postfix_text_len>(option::MaxPostfixTextLen{0}, std::forward<Args>(args)...),
diff --git a/include/indicators/setting.hpp b/include/indicators/setting.hpp
index 0d043e0..535e666 100644
--- a/include/indicators/setting.hpp
+++ b/include/indicators/setting.hpp
@@ -216,7 +216,7 @@ namespace option{
   using ShowRemainingTime = details::BooleanSetting<details::ProgressBarOption::show_remaining_time>;
   using SavedStartTime = details::BooleanSetting<details::ProgressBarOption::saved_start_time>;
   using ForegroundColor = details::Setting<Color, details::ProgressBarOption::foreground_color>;
-  using SpinnerShow = details::BooleanSetting<details::ProgressBarOption::spinner_show>;
+  using ShowSpinner = details::BooleanSetting<details::ProgressBarOption::spinner_show>;
   using SpinnerStates = details::Setting<std::vector<std::string>, details::ProgressBarOption::spinner_states>;
 }
 }
\ No newline at end of file
diff --git a/samples/progress_spinner.cpp b/samples/progress_spinner.cpp
index 5b571e7..5db4057 100644
--- a/samples/progress_spinner.cpp
+++ b/samples/progress_spinner.cpp
@@ -17,7 +17,7 @@ int main() {
       if (spinner.is_completed()) {
         spinner.set_option(indicators::option::ForegroundColor{indicators::Color::GREEN});
         spinner.set_option(indicators::option::PrefixText{"✔"});
-        spinner.set_option(indicators::option::SpinnerShow{false});
+        spinner.set_option(indicators::option::ShowSpinner{false});
         spinner.set_option(indicators::option::ShowPercentage{false});
         spinner.set_option(indicators::option::PostfixText{"Authenticated!"});
         spinner.mark_as_completed();