(Emacs/yasnippet)~C++ snippets have been pruned and edited

136 files changed, 129 insertions, 775 deletions

diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/accumulate b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/accumulate
deleted file mode 100644
index 496b75c..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/accumulate
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: accumulate
-# key: acm
-# --
-auto sum = std::accumulate(std::begin(${1:container}), std::end($1), 0);
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/accumulate-with-closure b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/accumulate-with-closure
deleted file mode 100644
index f2fd2cd..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/accumulate-with-closure
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: accumulate w/ closure
-# key: acl
-# --
-auto sum = std::accumulate(std::begin(${1:container}), std::end($1), 0, [](int total, $2) {
-  $3
-});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/adjacent_find b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/adjacent_find
deleted file mode 100644
index fd4c436..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/adjacent_find
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: adjacent_find
-# key: ajf
-# --
-auto pos = std::adjacent_find(std::begin(${1:container}), std::end($1));
-if (pos != std::end($1)) {
-  $2
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/all_of b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/all_of
deleted file mode 100644
index 299f837..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/all_of
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: all_of
-# key: alo
-# --
-if (std::all_of(std::begin(${1:container}), std::end($1), []($2) {
-  $3
-})) {
-  $4
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/any_of b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/any_of
deleted file mode 100644
index 7c957f8..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/any_of
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: any_of
-# key: ano
-# --
-if (std::any_of(std::begin(${1:container}), std::end($1), []($2) {
-  $3
-})) {
-  $4
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/assert b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/assert
deleted file mode 100644
index a662dd8..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/assert
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: assert
-# --
-assert($0);
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/bend b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/bend
index 7642355..e5cc387 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/bend
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/bend
@@ -3,4 +3,4 @@
 # key: bend
 # uuid: beginend
 # --
-${1:v}.begin(), $1.end()
\ No newline at end of file
+${1:a}.begin(), $1.end()
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/boost_require b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/boost_require
deleted file mode 100644
index 7b05028..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/boost_require
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: boost_require
-# key: req
-# uuid: req
-# group: boost
-# --
-BOOST_REQUIRE( ${1:condition} );
-$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/class b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/class
deleted file mode 100644
index 83ba750..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/class
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: class
-# --
-class ${1:Name} {
-    public:
-        ${1:$(yas/substr yas-text "[^: ]*")}();
-        ${2:virtual ~${1:$(yas/substr yas-text "[^: ]*")}();}
-};$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/const_[] b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/const_[]
deleted file mode 100644
index 57eed01..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/const_[]
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: const_[]
-# key: c[
-# uuid: c[
-# --
-const ${1:Type}& operator[](${2:int index}) const
-{
-        $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/constructor b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/constructor
deleted file mode 100644
index f76454b..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/constructor
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: constructor
-# key: ct
-# uuid: ct
-# --
-${1:Class}::$1(${2:args}) ${3: : ${4:init}} {
-    $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy
index 18653db..490d344 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy
@@ -2,4 +2,4 @@
 # name: copy
 # key: copy
 # --
-std::copy(std::begin(${1:container}), std::end($1), std::begin($2));
\ No newline at end of file
+std::copy(${1:std::begin(${2:a})}, ${3:std::end($2)}, ${4:std::begin(${5:b})})
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy_backward b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy_backward
deleted file mode 100644
index 74a986c..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy_backward
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: copy_backward
-# key: cpb
-# --
-std::copy_backward(std::begin(${1:container}), std::end($1), std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy_if b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy_if
index f1cb633..05cdb6e 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy_if
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy_if
@@ -2,7 +2,7 @@
 # name: copy_if
 # key: copy_if
 # --
-std::copy_if(std::begin(${1:container}), std::end($1), std::begin($2),
-[]($3) {
-  $4
-});
\ No newline at end of file
+std::copy_if(std::begin(${1:a}), std::end($1), std::begin(${2:b}),
+${3:[](${4:auto x}) {
+  ${5:return true;}
+}});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy_n b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy_n
index af2f225..281f094 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy_n
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy_n
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: copy_n
-# key: cpn
+# key: copy_n
 # --
-std::copy_n(std::begin(${1:container}), $2, std::end($1));
\ No newline at end of file
+std::copy_n(std::begin(${1:a}), ${2:n}, std::begin(${3:b}));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy_ostream_iter b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy_ostream_iter
deleted file mode 100644
index d836ecb..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/copy_ostream_iter
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: copy
-# key: oit
-# --
-std::copy(std::begin(${1:container}), std::end($1), std::ostream_iterator<$2>{
-%\istd::cout, "$3"
-});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/count b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/count
index d6ae58a..453fd11 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/count
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/count
@@ -2,4 +2,4 @@
 # name: count
 # key: count
 # --
-auto n = std::count(std::begin(${1:container}), std::end($1), $2);
\ No newline at end of file
+std::count(std::begin(${1:a}), std::end($1), ${2:b});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/count_if b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/count_if
index dccc852..6abbf9c 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/count_if
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/count_if
@@ -2,6 +2,6 @@
 # name: count_if
 # key: count_if
 # --
-auto n = std::count_if(std::begin(${1:container}), std::end($1), []($2) {
-  $3
-});
\ No newline at end of file
+std::count_if(std::begin(${1:a}), std::end($1), ${2:[](${3:auto x}) {
+  ${4:return true;}
+}});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/cstd b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/cstd
deleted file mode 100644
index 44074c9..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/cstd
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: cstd
-# key: cstd
-# uuid: cstd
-# --
-#include <cstdlib>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d+= b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d+=
deleted file mode 100644
index e5c32c9..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d+=
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: d+=
-# key: d+=
-# uuid: d+=
-# --
-${1:MyClass}& operator+=(${2:const $1 &});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d_operator b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d_operator
deleted file mode 100644
index b92780d..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d_operator
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: d_operator<<
-# key: <<
-# uuid: <<
-# --
-friend std::ostream& operator<<(std::ostream&, const ${1:Class}&);
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d_operator[] b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d_operator[]
deleted file mode 100644
index a96be67..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d_operator[]
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: d_operator[]
-# key: [
-# uuid: [
-# --
-${1:Type}& operator[](${2:int index});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d_operator[]_const b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d_operator[]_const
deleted file mode 100644
index 9c3a1ab..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d_operator[]_const
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: d_operator[]_const
-# key: c[
-# uuid: c[
-# --
-const ${1:Type}& operator[](${2:int index}) const;
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d_operator_istream b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d_operator_istream
deleted file mode 100644
index d38c0fc..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d_operator_istream
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: d_operator>>
-# key: >>
-# --
-friend std::istream& operator>>(std::istream&, const ${1:Name}&);
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d_operator_ostream b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d_operator_ostream
deleted file mode 100644
index d23f4d6..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/d_operator_ostream
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: d_operator<<
-# key: <<
-# --
-friend std::ostream& operator<<(std::ostream&, const ${1:Name}&);
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/delete b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/delete
deleted file mode 100644
index 1a7d1fe..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/delete
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: delete
-# key: delete
-# uuid: dl
-# --
-delete ${1:pointer};
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/delete[] b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/delete[]
deleted file mode 100644
index eb85608..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/delete[]
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: delete[]
-# key: dla
-# uuid: dla
-# --
-delete[] ${1:arr};
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/dynamic_casting b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/dynamic_casting
deleted file mode 100644
index a016c70..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/dynamic_casting
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: dynamic_casting
-# key: cast
-# uuid: cast
-# --
-check_and_cast<${1:Type} *>(${2:msg});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/enum b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/enum
deleted file mode 100644
index 14032a0..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/enum
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: enum
-# key: enum
-# --
-enum ${1:NAME} {$0};
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/equal b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/equal
index 1317962..a46eeb2 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/equal
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/equal
@@ -2,6 +2,4 @@
 # name: equal
 # key: equal
 # --
-if (std::equal(std::begin(${1:container}), std::end($1), std::begin($2))) {
-  $3
-}
\ No newline at end of file
+std::equal(std::begin(${1:a}), std::end($1), std::begin(${2:b}))
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/erase b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/erase
deleted file mode 100644
index 4ab6679..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/erase
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: remove
-# key: erm
-# --
-${1:container}.erase(std::remove(std::begin($1), std::end($1), $2), std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/erase_find_last_not_of b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/erase_find_last_not_of
deleted file mode 100644
index d2cf0b1..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/erase_find_last_not_of
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: generate_n
-# key: erf
-# --
-${1:container}.erase($1.find_last_not_of(" \t\n\r") + 1);
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fill b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fill
index 99130c9..e5e6923 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fill
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fill
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: fill
-# key: fil
+# key: fill
 # --
-std::fill(std::begin(${1:container}), std::end($1), $2);
\ No newline at end of file
+std::fill(std::begin(${1:a}), std::end($1), ${2:n});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fill_n b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fill_n
index 5c6b04a..f48a218 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fill_n
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fill_n
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: fill_n
-# key: fln
+# key: fill_n
 # --
-std::fill_n(std::begin(${1:container}), $2, $3);
\ No newline at end of file
+std::fill_n(std::begin(${1:v}), ${2:a}, ${3:n});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fin b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fin
deleted file mode 100644
index 41eaf6c..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fin
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-# name: find_if_not
-# key: fin
-# --
-auto pos = std::find_if_not(std::begin(${1:container}), std::end($1),[]($2) {
-  $3
-});
-if (pos != std::end($1)) {
-  $4
-}
-$0
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find
index f45093b..c4f16e1 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find
@@ -1,8 +1,5 @@
 # -*- mode: snippet -*-
 # name: find
-# key: fnd
+# key: find
 # --
-auto pos = std::find(std::begin(${1:container}), std::end($1), $2);
-if (pos != std::end($1)) {
-  $3
-}
\ No newline at end of file
+std::find(std::begin(${1:v}), std::end$(1), ${2:a});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find_end b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find_end
deleted file mode 100644
index 2eca444..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find_end
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-# name: find_end
-# key: fne
-# --
-auto pos = std::find_std::end(
-  std::begin(${1:container}), std::end($1),
-  std::begin($2), std::end($3)
-);
-if (pos != std::end($1)) {
-  $4
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find_first_of b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find_first_of
index 8217cc1..6d845f4 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find_first_of
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find_first_of
@@ -1,11 +1,8 @@
 # -*- mode: snippet -*-
 # name: find_first_of
-# key: ffo
+# key: find_first_of
 # --
-auto pos = std::find_first_of(
-  std::begin(${1:container}), std::end($1),
-  std::begin($2), std::end($3)
-);
-if (pos != std::end($1)) {
-  $4
-}
\ No newline at end of file
+std::find_first_of(
+  std::begin(${1:a}), std::end($1),
+  std::begin(${2:b}), std::end($2)
+);
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find_if b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find_if
index 1c02a0b..985aa0d 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find_if
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find_if
@@ -1,10 +1,7 @@
 # -*- mode: snippet -*-
 # name: find_if
-# key: fni
+# key: find_if
 # --
-auto pos = std::find_if(std::begin(${1:container}), std::end($1), []($2) {
-  $3
-});
-if (pos != std::end($1)) {
-  $4
-}
\ No newline at end of file
+std::find_if(std::begin(${1:v}), std::end($1), ${2:[](${3:auto x}) {
+  ${4:return true;}
+}});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find_if_not b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find_if_not
new file mode 100644
index 0000000..b1d32f4
--- /dev/null
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/find_if_not
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: find_if_not
+# key: find_if_not
+# --
+std::find_if_not(std::begin(${1:v}), std::end($1), ${2:[](${3:auto x}) {
+  ${4:return true;}
+}});
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fixture b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fixture
deleted file mode 100644
index f628b95..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fixture
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: fixture
-# key: fixt
-# uuid: fixt
-# --
-BOOST_FIXTURE_TEST_SUITE( ${1:name}, ${2:Fixture} )
-
-$0
-
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/for_each b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/for_each
index de1fbbb..22f9fb0 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/for_each
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/for_each
@@ -1,7 +1,7 @@
 # -*- mode: snippet -*-
 # name: for_each
-# key: fre
+# key: for_each
 # --
-std::for_each(std::begin(${1:container}), std::end($1), []($2) {
-  $3
-});
\ No newline at end of file
+std::for_each(std::begin(${1:container}), std::end($1), ${2:[](${3:auto x}) {
+  ${4:(void) x;}
+}});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/for_element b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/for_element
new file mode 100644
index 0000000..9295e64
--- /dev/null
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/for_element
@@ -0,0 +1,7 @@
+# -*- mode: snippet -*-
+# name: for_element
+# key: fore
+# --
+for (${1:const auto &x} : ${2:u}) {
+  $0
+}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/for_iter b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/for_iter
index 2e76242..3199fea 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/for_iter
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/for_iter
@@ -3,6 +3,6 @@
 # key: fori
 # uuid: fori
 # --
-for (${1:iter}=${2:var}.begin(); $1!=$2.end(); ++$1) {
+for (auto ${1:iter} = std::begin(${2:var}); $1 != std::end($2); ++$1) {
     $0
 }
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/friend b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/friend
deleted file mode 100644
index df0c024..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/friend
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: friend
-# key: fr
-# uuid: fr
-# --
-friend $0;
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fun_declaration b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fun_declaration
deleted file mode 100644
index 795365c..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/fun_declaration
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: fun_declaration
-# key: f
-# uuid: f
-# --
-${1:void} ${2:name}($3)$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/function b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/function
deleted file mode 100644
index 52d0402..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/function
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: function
-# --
-${1:void} ${2:Class}::${3:name}($4)${5: const} {
-    $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/generate b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/generate
deleted file mode 100644
index 73d65a9..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/generate
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: generate
-# key: gnr
-# --
-std::generate(std::begin(${1:container}), std::end($1), []($2) {
-  $3
-});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/generate_n b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/generate_n
deleted file mode 100644
index 8084b14..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/generate_n
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: generate_n
-# key: gnn
-# --
-std::generate_n(std::begin(${1:container}), $2, []($3) {
-  $4
-});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/gtest b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/gtest
deleted file mode 100644
index 4cc61a8..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/gtest
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: gtest
-# key: gtest
-# uuid: gtest
-# group: testing
-# --
-#include <gtest/gtest.h>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/ignore b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/ignore
deleted file mode 100644
index 3a3c610..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/ignore
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: ignore
-# key: ignore
-# uuid: ignore
-# --
-${1:std::}cin.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/include b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/include
deleted file mode 100644
index c4f4d44..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/include
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: #include <lib>
-# key: inc
-# --
-#include <${1:lib}>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/include_iostream b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/include_iostream
deleted file mode 100644
index b1ba34c..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/include_iostream
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: #include <iostream>
-# key: iio
-# uuid: iio
-# --
-#include <iostream>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/include_sstream b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/include_sstream
deleted file mode 100644
index bd97bcb..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/include_sstream
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: #include <sstream>
-# key: iss
-# uuid: iss
-# --
-#include <sstream>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/include_string b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/include_string
deleted file mode 100644
index 686660a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/include_string
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: #include <string>
-# key: istr
-# uuid: istr
-# --
-#include <string>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/inline b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/inline
deleted file mode 100644
index e545492..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/inline
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: inline
-# key: il
-# uuid: il
-# --
-inline $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/iota b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/iota
index 2690ac4..742dbb7 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/iota
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/iota
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: iota
-# key: ita
+# key: iota
 # --
-std::iota(std::begin(${1:container}), std::end($1), $2);
\ No newline at end of file
+std::iota(std::begin(${1:v}), std::end($1), ${2:n});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_heap b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_heap
deleted file mode 100644
index 24048b2..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_heap
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: is_heap
-# key: ihp
-# --
-if (std::is_heap(std::begin(${1:container}), std::end($1))) {
-  $2
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_heap_until b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_heap_until
deleted file mode 100644
index 99bf8f0..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_heap_until
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: is_heap_until
-# key: ihu
-# --
-auto pos = std::is_heap_until(std::begin(${1:container}), std::end($1));
-if (pos != std::end($1)) {
-  $2
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_partitioned b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_partitioned
deleted file mode 100644
index 48877b5..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_partitioned
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: is_partitioned
-# key: ipt
-# --
-if (std::is_partitioned(std::begin(${1:container}), std::end($1), []($2) {
-  $3
-})) {
-  $4
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_permutation b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_permutation
deleted file mode 100644
index eee5ba3..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_permutation
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: is_permutation
-# key: ipr
-# --
-if (std::is_permutation(std::begin(${1:container}), std::end($1), std::begin($2))) {
-  $3
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_sorted b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_sorted
index ddc3a96..46de96d 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_sorted
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_sorted
@@ -1,7 +1,5 @@
 # -*- mode: snippet -*-
 # name: is_sorted
-# key: iss
+# key: is_sorted
 # --
-if (std::is_sorted(std::begin(${1:container}), std::end($1))) {
-  $2
-}
\ No newline at end of file
+std::is_sorted(std::begin(${1:v}), std::end($1))
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_sorted_until b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_sorted_until
deleted file mode 100644
index 9eb6699..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/is_sorted_until
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: is_sorted_until
-# key: isu
-# --
-auto pos = std::is_sorted_until(std::begin(${1:container}), std::end($1));
-if (pos != std::end($1)) {
-  $2
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/iterator b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/iterator
index fe2b5cd..85c812d 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/iterator
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/iterator
@@ -3,4 +3,4 @@
 # key: iter
 # uuid: iter
 # --
-${1:std::}${2:vector<int>}::iterator ${3:iter};
+${1:std::vector<int>}::iterator ${3:iter};
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/lambda b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/lambda
index aa72fa3..59fa225 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/lambda
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/lambda
@@ -2,4 +2,4 @@
 # name: lambda
 # key: lam
 # --
-[$1]($2) { `(!%!)`$3 }
\ No newline at end of file
+[$1]($2) { $0 }
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/lexigraphical_compare b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/lexigraphical_compare
index 2d6dd06..f6c19d6 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/lexigraphical_compare
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/lexigraphical_compare
@@ -1,7 +1,5 @@
 # -*- mode: snippet -*-
 # name: lexigraphical_compare
-# key: lxc
+# key: lexigraphical_compare
 # --
-if (std::lexigraphical_compare(std::begin(${1:container}), std::end($1), std::begin($2), std::end($3))) {
-  $4
-}
\ No newline at end of file
+std::lexigraphical_compare(std::begin(${1:a}), std::end($1), std::begin(${2:b}), std::end($2))
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/make_heap b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/make_heap
deleted file mode 100644
index 6640b0e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/make_heap
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: make_heap
-# key: mkh
-# --
-std::make_heap(std::begin(${1:container}), std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/map b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/map
deleted file mode 100644
index ff349e1..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/map
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: map
-# key: map
-# uuid: map
-# --
-std::map<${1:type1}$0> ${2:var};
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/max_element b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/max_element
index 4a29080..2cd3721 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/max_element
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/max_element
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: max_element
-# key: mxe
+# key: max_element
 # --
-auto pos = std::max_element(std::begin(${1:container}), std::end($1));
\ No newline at end of file
+std::max_element(std::begin(${1:container}), std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/member_function b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/member_function
deleted file mode 100644
index ccc03fd..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/member_function
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- mode: snippet -*-
-# name: member_function
-# key: mf
-# --
-${1:type} ${2:Name}::${3:name}(${4:args})${5: const}
-{
-        $0
-}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/merge b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/merge
deleted file mode 100644
index c4753a2..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/merge
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: merge
-# key: mrg
-# --
-std::merge(std::begin(${1:container}), std::end($1),
-std::begin($2), std::end($3), std::begin($4));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/min_element b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/min_element
index e85d6f2..39fcfc6 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/min_element
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/min_element
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: min_element
-# key: mne
+# key: min_element
 # --
-auto pos = std::min_element(std::begin(${1:container}), std::end($1));
\ No newline at end of file
+std::min_element(std::begin(${1:container}), std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/minmax_element b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/minmax_element
index b80f63b..4c36571 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/minmax_element
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/minmax_element
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: minmax_element
-# key: mme
+# key: minmax_element
 # --
-auto minmax = std::minmax_element(std::begin(${1:container}), std::end($1));
\ No newline at end of file
+std::minmax_element(std::begin(${1:container}), std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/mismatch b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/mismatch
deleted file mode 100644
index 243ee0f..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/mismatch
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: mismatch
-# key: msm
-# --
-auto values = std::mismatch(std::begin(${1:container}), std::end($1), std::begin($1));
-if (values.first == std::end($1)) {
-  $2
-} else {
-  $3
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/module b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/module
deleted file mode 100644
index c203632..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/module
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: module
-# key: mod
-# uuid: mod
-# --
-class ${1:Class} : public cSimpleModule
-{
-   $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/move_backward b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/move_backward
deleted file mode 100644
index 62e7849..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/move_backward
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: move_backward
-# key: mpb
-# --
-std::move_backward(std::begin(${1:container}), std::end($1), std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/namespace b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/namespace
deleted file mode 100644
index e4afdb0..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/namespace
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name : namespace ...
-# key: ns
-# uuid: ns
-# --
-namespace ${1:name}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/namespace_block b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/namespace_block
deleted file mode 100644
index 839ef70..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/namespace_block
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: namespace
-# key: nss
-# --
-namespace ${1:name} {
-  $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/next_permutation b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/next_permutation
deleted file mode 100644
index 78b468a..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/next_permutation
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: next_permutation
-# key: nxp
-# --
-if (std::next_permutation(std::begin(${1:container}), std::end($1))) {
-  $2
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/none_of b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/none_of
index 88a716d..eb9b23e 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/none_of
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/none_of
@@ -1,9 +1,7 @@
 # -*- mode: snippet -*-
 # name: none_of
-# key: nno
+# key: none_of
 # --
-if (std::none_of(std::begin(${1:container}), std::end($1), []($2) {
-  $3
-})) {
-  $4
-}
\ No newline at end of file
+std::none_of(std::begin(${1:container}), std::end($1), ${2:[](${3:auto x}) {
+  ${4:return true;}
+}});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/nth_element b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/nth_element
deleted file mode 100644
index b0da080..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/nth_element
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: nth_element
-# key: nth
-# --
-std::nth_element(std::begin(${1:container}), std::end($1), std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator!= b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator!=
deleted file mode 100644
index 5cf876b..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator!=
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: operator!=
-# key: !=
-# uuid: !=
-# group: operator overloading
-# --
-bool ${1:MyClass}::operator!=(const $1 &other) const {
-    return !(*this == other);
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator+ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator+
deleted file mode 100644
index 0d4d10c..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator+
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- mode: snippet -*-
-# name: operator+
-# key: +
-# uuid: +
-# group: operator overloading
-# --
-${1:MyClass} $1::operator+(const $1 &other)
-{
-    $1 result = *this;
-    result += other;
-    return result;
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator+= b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator+=
deleted file mode 100644
index 643a65e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator+=
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-# name: operator+=
-# key: +=
-# uuid: +=
-# group: operator overloading
-# --
-${1:MyClass}& $1::operator+=(${2:const $1 &rhs})
-{
-  $0
-  return *this;
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator= b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator=
deleted file mode 100644
index 08f2e67..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator=
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- mode: snippet -*-
-# name: operator=
-# key: =
-# uuid: =
-# where this is a reference to myself
-# group: operator overloading
-# --
-${1:MyClass}& $1::operator=(const $1 &rhs) {
-    // Check for self-assignment!
-    if (this == &rhs)
-      return *this;
-    $0
-    return *this;
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator== b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator==
deleted file mode 100644
index 08f804e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator==
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- mode: snippet -*-
-# name: operator==
-# key: ==
-# uuid: ==
-# group: operator overloading
-# --
-bool ${1:MyClass}::operator==(const $1 &other) const {
-     $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator[] b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator[]
deleted file mode 100644
index 9bfea7d..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator[]
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: operator[]
-# key: []
-# uuid: []
-# group: operator overloading
-# --
-${1:Type}& operator[](${2:int index})
-{
-        $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator_istream b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator_istream
index 9b4c8c2..73c3ff7 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator_istream
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator_istream
@@ -1,10 +1,11 @@
 # -*- mode: snippet -*-
 # name: operator>>
-# key: >>
+# key: operator>>
 # uuid: >>
 # group: operator overloading
 # --
 istream& operator>>(istream& s, const ${1:type}& ${2:c})
 {
-         $0
+  $0
+  return s;
 }
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator_ostream b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator_ostream
index 9463e2c..ac28638 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator_ostream
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/operator_ostream
@@ -1,11 +1,11 @@
 # -*- mode: snippet -*-
 # name: operator<<
-# key: <<
+# key: operator<<
 # uuid: <<
 # group: operator overloading
 # --
 std::ostream& operator<<(std::ostream& s, const ${1:type}& ${2:c})
 {
-         $0
-         return s;
+  $0
+  return s;
 }
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/ostream b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/ostream
deleted file mode 100644
index b0054f7..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/ostream
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: ostream
-# key: os
-# uuid: os
-# --
-#include <ostream>
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/pack b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/pack
deleted file mode 100644
index c15b02e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/pack
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: pack
-# key: pack
-# uuid: pack
-# --
-void cNetCommBuffer::pack(${1:type}) {
-
-}
-
-$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/partial_sort b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/partial_sort
deleted file mode 100644
index eafb136..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/partial_sort
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: partial_sort
-# key: pst
-# --
-std::partial_sort(std::begin(${1:container}), std::end($1), std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/partial_sort_copy b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/partial_sort_copy
deleted file mode 100644
index be91ecd..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/partial_sort_copy
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: partial_sort_copy
-# key: psc
-# --
-std::partial_sort_copy(std::begin(${1:container}), std::end($1),
-                       std::begin($2), std::end($3));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/partition b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/partition
deleted file mode 100644
index e381b28..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/partition
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: partition
-# key: ptn
-# --
-auto pos = std::partition(std::begin(${1:container}), std::end($1), []($2) {
-  $3
-});
-if (pos != std::end($1)) {
-  $4
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/partition_copy b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/partition_copy
deleted file mode 100644
index f74d0da..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/partition_copy
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: partition_copy
-# key: ptc
-# --
-std::partition_copy(std::begin(${1:container}), std::end($1),
-                    std::begin($2), std::end($3));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/partition_point b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/partition_point
deleted file mode 100644
index d890532..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/partition_point
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: partition_point
-# key: ppt
-# --
-auto pos = std::partition_point(std::begin(${1:container}), std::end($1), []($2) {
-  $3
-});
-if (pos != std::end($1)) {
-  $4
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/prev_permutation b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/prev_permutation
deleted file mode 100644
index 9b202f6..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/prev_permutation
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: prev_permutation
-# key: prp
-# --
-if (std::prev_permutation(std::begin(${1:container}), std::end($1))) {
-  $2
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/private b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/private
deleted file mode 100644
index ddf50d7..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/private
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: private
-# expand-env: ((yas-also-auto-indent-first-line t))
-# --
-private:
-    $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/protected b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/protected
deleted file mode 100644
index 931eb2e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/protected
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: protected
-# expand-env: ((yas-also-auto-indent-first-line t))
-# --
-protected:
-    $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/public b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/public
deleted file mode 100644
index 04b1afb..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/public
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: public
-# expand-env: ((yas-also-auto-indent-first-line t))
-# --
-public:
-    $0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/push_heap b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/push_heap
deleted file mode 100644
index 281a847..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/push_heap
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: push_heap
-# key: phh
-# --
-std::push_heap(std::begin(${1:container}), std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/random_shuffle b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/random_shuffle
index bbc078d..af7be45 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/random_shuffle
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/random_shuffle
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: random_shuffle
-# key: shf
+# key: random_shuffle
 # --
 std::random_shuffle(std::begin(${1:container}), std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove
index 3cbee04..10b0d10 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove
@@ -1,8 +1,5 @@
 # -*- mode: snippet -*-
 # name: remove
-# key: rmv
+# key: remove
 # --
-auto pos = std::remove(std::begin(${1:container}), std::end($1), $2);
-if (pos != std::end($1)) {
-  $3
-}
\ No newline at end of file
+std::remove(std::begin(${1:v}), std::end($1), ${2:n});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove_copy b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove_copy
index 3dbf85a..4312811 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove_copy
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove_copy
@@ -1,6 +1,6 @@
 # -*- mode: snippet -*-
 # name: remove_copy
-# key: rmc
+# key: remove_copy
 # --
-std::remove_copy(std::begin(${1:container}), std::end($1),
-  std::begin($1), $2);
\ No newline at end of file
+std::remove_copy(std::begin(${1:u}), std::end($1),
+  std::begin(${2:v}), ${3:n});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove_copy_if b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove_copy_if
index cba8760..66be9b8 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove_copy_if
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove_copy_if
@@ -1,9 +1,9 @@
 # -*- mode: snippet -*-
 # name: remove_copy_if
-# key: rmf
+# key: remove_copy_if
 # --
-std::remove_copy_if(std::begin(${1:container}), std::end($1),
-  std::begin($1), []($2) {
-    $3
-  }
+std::remove_copy_if(std::begin(${1:u}), ${2:std::end($1)},
+  std::begin(${3:v}), ${4:[](${5:auto x}) {
+    ${6:return true;}
+  }}
 );
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove_if b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove_if
index e12d0c8..b4f7814 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove_if
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/remove_if
@@ -1,10 +1,7 @@
 # -*- mode: snippet -*-
 # name: remove_if
-# key: rmi
+# key: remove_if
 # --
-auto pos = std::remove_if(std::begin(${1:container}), std::end($1), []($2) {
-  $3
-});
-if (pos != std::end($1)) {
-  $4
-}
\ No newline at end of file
+std::remove_if(std::begin(${1:u}), ${2:std::end($1)}, ${3:[](${4:auto x}) {
+  ${5:return true;}
+}});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace
index be2729e..c765530 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: replace
-# key: rpl
+# key: replace
 # --
-std::replace(std::begin(${1:container}), std::end($1), $2, $3);
\ No newline at end of file
+std::replace(std::begin(${1:container}), std::end($1), ${2:old}, ${3:new});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace_copy b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace_copy
index a085f1d..67a0866 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace_copy
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace_copy
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: replace_copy
-# key: rpc
+# key: replace_copy
 # --
-std::replace_copy(std::begin(${1:container}), std::end($1), std::begin($1), $2, $3);
\ No newline at end of file
+std::replace_copy(std::begin(${1:u}), std::end($1), std::begin(${2:v}), ${3:old}, ${4:new});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace_copy_if b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace_copy_if
index 4558e0d..709026d 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace_copy_if
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace_copy_if
@@ -1,12 +1,13 @@
 # -*- mode: snippet -*-
 # name: replace_copy_if
-# key: rci
+# key: replace_copy_if
 # --
 std::replace_copy_if(
-  std::begin(${1:container}),
+  std::begin(${1:u}),
   std::end($1),
-  std::begin($1), []($2) {
-    $3
-  },
-  $4
+  std::begin(${2:v}),
+  ${3:[](${4:auto x}) {
+    ${5:return true;}
+  }},
+  ${6:new}
 );
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace_if b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace_if
index 9cc11d3..494238c 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace_if
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/replace_if
@@ -1,11 +1,11 @@
 # -*- mode: snippet -*-
 # name: replace_if
-# key: rpi
+# key: replace_if
 # --
 std::replace_if(
-  std::begin(${1:container}),
-  std::end($1), []($2) {
-    $3
-  },
-  $4
+  std::begin(${1:v}),
+  std::end($1), ${2:[](${3:auto x}) {
+    ${4:return true;}
+  }},
+  ${5:new}
 );
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/reverse b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/reverse
index 8a64ca1..48c6105 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/reverse
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/reverse
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: reverse
-# key: rvr
+# key: reverse
 # --
-std::reverse(std::begin(${1:container}), std::end($1));
\ No newline at end of file
+std::reverse(std::begin(${1:container}, std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/rotate b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/rotate
index 1fb59ec..b2786ed 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/rotate
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/rotate
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: rotate
-# key: rte
+# key: rotate
 # --
-std::rotate(std::begin(${1:container}), std::begin($2), std::end($1));
\ No newline at end of file
+std::rotate(std::begin(${1:u}), ${2:middle}, std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/rotate_copy b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/rotate_copy
deleted file mode 100644
index 287fb07..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/rotate_copy
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: rotate_copy
-# key: rtc
-# --
-std::rotate_copy(std::begin(${1:container}), std::begin($2), std::end($1), std::begin($3));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/search b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/search
index 580a29a..324b483 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/search
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/search
@@ -1,9 +1,5 @@
 # -*- mode: snippet -*-
 # name: search
-# key: srh
+# key: search
 # --
-auto pos = std::search(std::begin(${1:container}), std::end($1),
-  std::begin($2), std::end($3));
-if (pos != std::end($1)) {
-  $4
-}
\ No newline at end of file
+std::search(std::begin(${1:u}), std::end($1), std::begin(${2:v}), std::end($2));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/search_n b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/search_n
index 7f7f879..0b6338b 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/search_n
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/search_n
@@ -1,8 +1,5 @@
 # -*- mode: snippet -*-
 # name: search_n
-# key: srn
+# key: search_n
 # --
-auto pos = std::search_n(std::begin(${1:container}), std::end($1),$2,$3);
-if (pos != std::end($1)) {
-  $4
-}
\ No newline at end of file
+std::search_n(std::begin(${1:u}), std::end($1), ${2:size}, ${3:value});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/sort b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/sort
index 4b88ee8..3574a79 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/sort
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/sort
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: sort
-# key: srt
+# key: sort
 # --
 std::sort(std::begin(${1:container}), std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/sort_heap b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/sort_heap
index c83c6a9..8516bd5 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/sort_heap
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/sort_heap
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: sort_heap
-# key: sth
+# key: sort_heap
 # --
 std::sort_heap(std::begin(${1:container}), std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/stable_partition b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/stable_partition
index 1c3b9f7..035c844 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/stable_partition
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/stable_partition
@@ -1,10 +1,7 @@
 # -*- mode: snippet -*-
 # name: stable_partition
-# key: spt
+# key: stable_partition
 # --
-auto pos = std::stable_partition(std::begin(${1:container}), std::end($1), []($2) {
-  $3
-});
-if (pos != std::end($1)) {
-  $4
-}
\ No newline at end of file
+std::stable_partition(std::begin(${1:u}), std::end($1), ${3:[](${4:auto x}) {
+  ${5:return true;}
+}});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/stable_sort b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/stable_sort
index 74cede9..7248aa8 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/stable_sort
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/stable_sort
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: stable_sort
-# key: sts
+# key: stable_sort
 # --
 std::stable_sort(std::begin(${1:container}), std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/std b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/std
deleted file mode 100644
index 5df8934..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/std
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: std
-# key: std
-# uuid: std
-# --
-using namespace std;
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/std_colon b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/std_colon
deleted file mode 100644
index 950aa0e..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/std_colon
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: std::
-# key: st
-# uuid: st
-# --
-std::$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/swap_ranges b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/swap_ranges
index 9f2f4b5..17c60f3 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/swap_ranges
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/swap_ranges
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: swap_ranges
-# key: swr
+# key: swap_ranges
 # --
-std::swap_ranges(std::begin(${1:container}), std::end($1), std::begin($2));
\ No newline at end of file
+std::swap_ranges(std::begin(${1:u}), std::end($1), std::begin(${2:v}));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/template b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/template
deleted file mode 100644
index f40864d..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/template
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: template
-# key: temp
-# uuid: temp
-# --
-template<${1:$$(yas/choose-value '("typename" "class"))} ${2:T}>
-$0
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/test-case b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/test-case
deleted file mode 100644
index 8af5260..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/test-case
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: test case
-# key: tc
-# uuid: tc
-# group: testing
-# --
-BOOST_AUTO_TEST_CASE( ${1:test_case} )
-{
-        $0
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/test_main b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/test_main
deleted file mode 100644
index c96e40d..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/test_main
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: test_main
-# key: test_main
-# uuid: test_main
-# group: testing
-# --
-int main(int argc, char **argv) {
-      ::testing::InitGoogleTest(&argc, argv);
-       return RUN_ALL_TESTS();
-}
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/test_suite b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/test_suite
deleted file mode 100644
index dc6dda3..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/test_suite
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- mode: snippet -*-
-# name: test_suite
-# key: ts
-# uuid: ts
-# group: testing
-# --
-BOOST_AUTO_TEST_SUITE( ${1:test_suite1} )
-
-$0
-
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/this b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/this
deleted file mode 100644
index 173cb26..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/this
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- mode: snippet -*-
-# name: this
-# --
-this
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/throw b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/throw
deleted file mode 100644
index d264dd7..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/throw
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: throw
-# key: throw
-# uuid: throw
-# --
-throw ${1:MyError}($0);
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/transform b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/transform
index 12d4881..d3fb9ee 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/transform
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/transform
@@ -1,9 +1,8 @@
 # -*- mode: snippet -*-
 # name: transform
-# key: tfm
+# key: transform
 # --
-std::transform(std::begin(${1:container}), std::end($1),
-  std::begin($1), []($2) {
-$3%
-});
-$0
+std::transform(std::begin(${1:u}), std::end($1),
+  std::begin(${2:$1}), ${3:[](${4:auto x}) {
+  ${5:return x;}
+}});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/transform-with-closure b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/transform-with-closure
deleted file mode 100644
index 51427c7..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/transform-with-closure
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: transform
-# key: upr
-# --
-std::transform(std::begin(${1:container}), std::end($1), std::begin($1), [](char c) {
-  `(or (concat % "\n") "")`return std::toupper(c);
-});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/transform_lowercase b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/transform_lowercase
deleted file mode 100644
index 045c98b..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/transform_lowercase
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- mode: snippet -*-
-# name: string to lower case
-# key: lwr
-# --
-std::transform(std::begin(${1:container}), std::end($1), std::begin($1), [](char c) {
-  `(or (concat % "\n") "")`return std::tolower(c);
-});
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/trim_left b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/trim_left
deleted file mode 100644
index c456570..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/trim_left
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- mode: snippet -*-
-# name: remove whitespace at beginning
-# key: ltr
-# --
-${1:container}.erase(0, $1.find_first_not_of(" \t\n\r"));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/tryw b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/tryw
deleted file mode 100644
index 004d15c..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/tryw
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- mode: snippet -*-
-# name: tryw
-# key: tryw
-# uuid: tryw
-# --
-try {
-    `(or yas/selected-text (car kill-ring))`
-} catch ${1:Exception} {
-
-}
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/unique b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/unique
index 7268a3d..fff99af 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/unique
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/unique
@@ -1,5 +1,5 @@
 # -*- mode: snippet -*-
 # name: unique
-# key: uqe
+# key: unique
 # --
-auto pos = std::unique(std::begin(${1:container}), std::end($1));
\ No newline at end of file
+std::unique(std::begin(${1:u}), std::end($1));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/unique_copy b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/unique_copy
index 709b875..3738983 100644
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/unique_copy
+++ b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/unique_copy
@@ -1,6 +1,5 @@
 # -*- mode: snippet -*-
 # name: unique_copy
-# key: ucp
+# key: unique_copy
 # --
-std::unique_copy(std::begin(${1:container}), std::end($1),
-  std::ostream_iterator<string>(std::cout, "\n"));
\ No newline at end of file
+std::unique_copy(std::begin(${1:u}), std::end($1), std::begin(${2:v}));
\ No newline at end of file
diff --git a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/using b/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/using
deleted file mode 100644
index 3c113ce..0000000
--- a/Emacs/.config/emacs/.config/yasnippet/snippets/c++-mode/using
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- mode: snippet -*-
-# name: using namespace ... 
-# key: using
-# uuid: using
-# --
-using namespace ${std};
\ No newline at end of file