diff --git a/src/common/FilterButton/FilterButton.js b/src/common/FilterButton/FilterButton.js
index 342f8ea..061d49f 100644
--- a/src/common/FilterButton/FilterButton.js
+++ b/src/common/FilterButton/FilterButton.js
@@ -1,18 +1,17 @@
-import React, {Component} from "react";
+import React, { useState, useContext, useRef, useEffect } from "react";
 import PropTypes from "prop-types";
-import {observer} from "mobx-react";
-import {withRouter} from "react-router-dom";
+import { observer } from "mobx-react";
+import { withRouter } from "react-router-dom";
 import style from './style.module.scss';
-import {ThemeContext} from "../../themeContext";
+import { ThemeContext } from "../../themeContext";
 
-class FilterButton extends Component {
+const FilterButton = observer(withRouter(({ buttonPressed, dataCyPrefix, value, onClick, children, className, withIcon, withIconRight }) => {
+    const [clickCount, setClickCount] = useState(0);
+    const [spanStyles, setSpanStyles] = useState({});
+    const themeContext = useContext(ThemeContext);
+    const bounce = useRef(null);
 
-    state = {
-        clickCount: 0,
-        spanStyles: {}
-    }
-
-    showRipple = (e) => {
+    const showRipple = (e) => {
         const rippleContainer = e.currentTarget;
         const size = rippleContainer.offsetWidth;
         const pos = rippleContainer.getBoundingClientRect();
@@ -20,94 +19,86 @@ class FilterButton extends Component {
         const event_offsetY = e.pageY - window.pageYOffset - pos.top;
         const x = event_offsetX - (size / 2);
         const y = event_offsetY - (size / 2);
-        const spanStyles = {top: y + 'px', left: x + 'px', height: size + 'px', width: size + 'px'};
-        const count = this.state.clickCount + 1;
-        this.setState({
-            spanStyles: {...this.state.spanStyles, [count]: spanStyles},
-            clickCount: count
-        });
+        const newSpanStyles = { top: y + 'px', left: x + 'px', height: size + 'px', width: size + 'px' };
+        const count = clickCount + 1;
+        setSpanStyles(prevStyles => ({ ...prevStyles, [count]: newSpanStyles }));
+        setClickCount(count);
     }
 
-    renderRippleSpan = () => {
-        const {showRipple = false, spanStyles = {}} = this.state;
+    const renderRippleSpan = () => {
         const spanArray = Object.keys(spanStyles);
-        if (spanArray && spanArray.length > 0) {
-            return (
-                spanArray.map((key, index) => {
-                    return <span key={'spanCount_' + index} className="" style={{...spanStyles[key]}}></span>
-                })
-            )
-        } else {
-            return null;
-        }
+        return (
+          spanArray.length > 0 ? (
+            spanArray.map((key, index) => (
+              <span key={'spanCount_' + index} className="" style={{ ...spanStyles[key] }}></span>
+            ))
+          ) : null
+        );
     }
 
-    cleanUp = () => {
-        const initialState = {
-            clickCount: 0,
-            spanStyles: {}
-        };
-        this.setState({...initialState});
+    const cleanUp = () => {
+        setClickCount(0);
+        setSpanStyles({});
     }
 
-    callCleanUp = (cleanup, delay) => {
+    const callCleanUp = (delay) => {
         return () => {
-            clearTimeout(this.bounce);
-            this.bounce = setTimeout(() => {
-                cleanup();
+            clearTimeout(bounce.current);
+            bounce.current = setTimeout(() => {
+                cleanUp();
             }, delay);
         }
     }
 
-    render() {
-        const themeContext = this.context;
-
-
-        const {buttonPressed} = this.props;
-        const pressed = buttonPressed ? 'pressed' : 'unpressed';
+    useEffect(() => {
+        return () => {
+            if (bounce.current) {
+                clearTimeout(bounce.current);
+            }
+        };
+    }, []);
 
-        const classes = [style.FilterButton];
+    const pressed = buttonPressed ? 'pressed' : 'unpressed';
 
-        if(themeContext.theme === 'dark') {
-            classes.push(style.FilterButton_dark);
-        } else {
-            classes.push(style.FilterButton_light)
-        }
+    const classes = [style.FilterButton];
 
-        if (this.props.className) {
-            classes.push(this.props.className);
-        }
+    if (themeContext.theme === 'dark') {
+        classes.push(style.FilterButton_dark);
+    } else {
+        classes.push(style.FilterButton_light);
+    }
 
-        if (this.props.withIcon) {
-            classes.push(style.FilterButton__withIcon);
-        }
+    if (className) {
+        classes.push(className);
+    }
 
-        if (this.props.withIconRight) {
-            classes.push(style.FilterButton__withIconRight);
-        }
+    if (withIcon) {
+        classes.push(style.FilterButton__withIcon);
+    }
 
-        if (pressed === 'pressed') {
-            classes.push(style.FilterButton__pressed);
-        }
+    if (withIconRight) {
+        classes.push(style.FilterButton__withIconRight);
+    }
 
-        return (
-            <button
-                className={classes.join(' ')}
-                data-cy={this.props.dataCyPrefix + pressed}
-                value={this.props.value}
-                onClick={this.props.onClick}
-            >
-                {this.props.children}
-                <div className={style.FilterButton_rippleContainer} onMouseDown={this.showRipple}
-                     onMouseUp={this.callCleanUp(this.cleanUp, 2000)}>
-                    {this.renderRippleSpan()}
-                </div>
-            </button>
-        );
+    if (pressed === 'pressed') {
+        classes.push(style.FilterButton__pressed);
     }
-}
 
-FilterButton.contextType = ThemeContext;
+    return (
+      <button
+        className={classes.join(' ')}
+        data-cy={dataCyPrefix + pressed}
+        value={value}
+        onClick={onClick}
+      >
+          {children}
+          <div className={style.FilterButton_rippleContainer} onMouseDown={showRipple}
+               onMouseUp={callCleanUp(2000)}>
+              {renderRippleSpan()}
+          </div>
+      </button>
+    );
+}));
 
 FilterButton.propTypes = {
     tech: PropTypes.any,
@@ -116,7 +107,4 @@ FilterButton.propTypes = {
     className: PropTypes.string
 };
 
-FilterButton = observer(FilterButton);
-FilterButton = withRouter(FilterButton);
-
-export default FilterButton;
\ No newline at end of file
+export default FilterButton;
diff --git a/src/common/ThemeSwitcher.js b/src/common/ThemeSwitcher.js
index 9c0eac4..e53a0e1 100644
--- a/src/common/ThemeSwitcher.js
+++ b/src/common/ThemeSwitcher.js
@@ -1,23 +1,21 @@
-import React from 'react';
+import React, { useContext } from 'react';
 
-import {ThemeContext} from "../themeContext";
+import { ThemeContext } from "../themeContext";
 
 import style from './ThemeSwitcher.module.scss';
 
-export class ThemeSwitcher extends React.Component {
+const ThemeSwitcher = () => {
+    const { theme, toggleTheme } = useContext(ThemeContext);
 
-    render() {
+    const className = theme === 'dark'
+      ? [style.ThemeSwitcher, style.ThemeSwitcher_dark].join(' ')
+      : [style.ThemeSwitcher, style.ThemeSwitcher_light].join(' ');
 
-        return (
-            <ThemeContext.Consumer>
-                {({theme, toggleTheme}) => (
-                    <label htmlFor="theme" className={theme === 'dark' ? [style.ThemeSwitcher, style.ThemeSwitcher_dark].join(' ') : [style.ThemeSwitcher, style.ThemeSwitcher_light].join(' ')}>
-                        <input onChange={toggleTheme} type="checkbox" name="theme" id="theme"/>
-                    </label>
-                )}
-            </ThemeContext.Consumer>
-        );
-    }
+    return (
+      <label htmlFor="theme" className={className}>
+          <input onChange={toggleTheme} type="checkbox" name="theme" id="theme"/>
+      </label>
+    );
 }
 
-export default ThemeSwitcher;
\ No newline at end of file
+export default ThemeSwitcher;